sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-11-28 20:19:37 +01:00
parent 0c3bcf6c86
commit 01cd4986cc
20 changed files with 112 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Nazara/Widgets/AbstractTextAreaWidget.cpp
View File

@@ -120,6 +120,11 @@ namespace Nz
return Vector2ui::Zero();
}
bool AbstractTextAreaWidget::IsFocusable() const
{
return !m_readOnly;
}
void AbstractTextAreaWidget::Layout()
{
BaseWidget::Layout();
@@ -135,11 +140,6 @@ namespace Nz
RefreshCursor();
}
bool AbstractTextAreaWidget::IsFocusable() const
{
return !m_readOnly;
}
void AbstractTextAreaWidget::OnFocusLost()
{
// Hide cursors
@@ -367,7 +367,7 @@ namespace Nz
m_isMouseButtonDown = false;
}
void AbstractTextAreaWidget::OnMouseMoved(int x, int y, int deltaX, int deltaY)
void AbstractTextAreaWidget::OnMouseMoved(int x, int y, int /*deltaX*/, int /*deltaY*/)
{
if (m_isMouseButtonDown)
SetSelection(m_selectionCursor, GetHoveredGlyph(float(x), float(y)));

9
src/Nazara/Widgets/BaseWidget.cpp
View File

@@ -187,13 +187,8 @@ namespace Nz
auto& registry = GetRegistry();
for (WidgetEntity& entity : m_entities)
{
if (entity.isEnabled)
{
if (GraphicsComponent* gfx = registry.try_get<GraphicsComponent>(entity.handle))
gfx->Show(show);
entity.isEnabled = true;
}
if (GraphicsComponent* gfx = registry.try_get<GraphicsComponent>(entity.handle))
gfx->Show(show);
}
ShowChildren(show);