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

Merge pull request #206 from alexandre-janniaux/warnings/misc/fix-shadow-variable/1

Browse Source 
Fix some shadowing variable warnings
This commit is contained in:
Jérôme Leclercq
2019-07-08 12:54:10 +02:00
committed by GitHub
parent 7da8945c72 e29f2f7a92
commit c2dd032ed2
3 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SDK/src/NDK/BaseWidget.cpp
View File

@@ -197,9 +197,9 @@ namespace Ndk
newEntity->Enable(m_visible);
m_entities.emplace_back();
WidgetEntity& widgetEntity = m_entities.back();
widgetEntity.handle = newEntity;
widgetEntity.onDisabledSlot.Connect(newEntity->OnEntityDisabled, [this](Entity* entity)
WidgetEntity& newWidgetEntity = m_entities.back();
newWidgetEntity.handle = newEntity;
newWidgetEntity.onDisabledSlot.Connect(newEntity->OnEntityDisabled, [this](Entity* entity)
{
auto it = std::find_if(m_entities.begin(), m_entities.end(), [&](const WidgetEntity& widgetEntity) { return widgetEntity.handle == entity; });
NazaraAssert(it != m_entities.end(), "Entity does not belong to this widget");
@@ -207,7 +207,7 @@ namespace Ndk
it->isEnabled = false;
});
widgetEntity.onEnabledSlot.Connect(newEntity->OnEntityEnabled, [this](Entity* entity)
newWidgetEntity.onEnabledSlot.Connect(newEntity->OnEntityEnabled, [this](Entity* entity)
{
auto it = std::find_if(m_entities.begin(), m_entities.end(), [&](const WidgetEntity& widgetEntity) { return widgetEntity.handle == entity; });
NazaraAssert(it != m_entities.end(), "Entity does not belong to this widget");

6
SDK/src/NDK/Widgets/TextAreaWidget.cpp
View File

@@ -582,9 +582,9 @@ namespace Ndk
};
// Move text so that cursor is always visible
const auto* glyph = GetGlyph(m_cursorPositionEnd, nullptr);
float glyphPos = (glyph) ? glyph->bounds.x : 0.f;
float glyphWidth = (glyph) ? glyph->bounds.width : 0.f;
const auto* lastGlyph = GetGlyph(m_cursorPositionEnd, nullptr);
float glyphPos = (lastGlyph) ? lastGlyph->bounds.x : 0.f;
float glyphWidth = (lastGlyph) ? lastGlyph->bounds.width : 0.f;
auto& node = m_textEntity->GetComponent<Ndk::NodeComponent>();
float textPosition = node.GetPosition(Nz::CoordSys_Local).x - paddingWidth;