From ce6eb1d6d91588b0ecb88dbc1919f66078635818 Mon Sep 17 00:00:00 2001 From: EloD10 Date: Wed, 22 Feb 2017 17:54:00 +0100 Subject: [PATCH 1/3] Update Console.cpp (#117) * Update Console.cpp Deleting a semicolon * Update ButtonWidget.cpp Removing empty fuction * Update ButtonWidget.hpp Removing unnecessary variable --- SDK/include/NDK/Widgets/ButtonWidget.hpp | 1 - SDK/src/NDK/Console.cpp | 2 +- SDK/src/NDK/Widgets/ButtonWidget.cpp | 5 +---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/SDK/include/NDK/Widgets/ButtonWidget.hpp b/SDK/include/NDK/Widgets/ButtonWidget.hpp index 78f978719..8f2231501 100644 --- a/SDK/include/NDK/Widgets/ButtonWidget.hpp +++ b/SDK/include/NDK/Widgets/ButtonWidget.hpp @@ -40,7 +40,6 @@ namespace Ndk void Layout() override; void OnMouseEnter() override; - void OnMouseMoved(int x, int y, int deltaX, int deltaY) override; void OnMouseButtonRelease(int x, int y, Nz::Mouse::Button button) override; void OnMouseExit() override; diff --git a/SDK/src/NDK/Console.cpp b/SDK/src/NDK/Console.cpp index 9719e4b62..3843978ad 100644 --- a/SDK/src/NDK/Console.cpp +++ b/SDK/src/NDK/Console.cpp @@ -300,7 +300,7 @@ namespace Ndk void Console::ExecuteInput() { Nz::String input = m_inputDrawer.GetText(); - Nz::String inputCmd = input.SubString(s_inputPrefixSize);; + Nz::String inputCmd = input.SubString(s_inputPrefixSize); m_inputDrawer.SetText(s_inputPrefix); if (m_commandHistory.empty() || m_commandHistory.back() != inputCmd) diff --git a/SDK/src/NDK/Widgets/ButtonWidget.cpp b/SDK/src/NDK/Widgets/ButtonWidget.cpp index 8d3a69e33..29c04c98f 100644 --- a/SDK/src/NDK/Widgets/ButtonWidget.cpp +++ b/SDK/src/NDK/Widgets/ButtonWidget.cpp @@ -61,10 +61,7 @@ namespace Ndk m_gradientSprite->SetColor(Nz::Color(128, 128, 128)); } - void ButtonWidget::OnMouseMoved(int x, int y, int deltaX, int deltaY) - { - } - + void ButtonWidget::OnMouseExit() { m_gradientSprite->SetColor(Nz::Color(74, 74, 74)); From 8d402f0491990d33812893e26ad659e7559f5abb Mon Sep 17 00:00:00 2001 From: EloD10 Date: Thu, 23 Feb 2017 00:07:51 +0100 Subject: [PATCH 2/3] Update ContextParameters.cpp (#119) * Update ContextParameters.cpp Changing an incorrect comment * Update ContextParameters.cpp --- src/Nazara/Renderer/ContextParameters.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Nazara/Renderer/ContextParameters.cpp b/src/Nazara/Renderer/ContextParameters.cpp index cdb087561..1af405b2e 100644 --- a/src/Nazara/Renderer/ContextParameters.cpp +++ b/src/Nazara/Renderer/ContextParameters.cpp @@ -8,28 +8,28 @@ namespace Nz { - // Version majeure d'OpenGL, initialisé par OpenGL::Initialize() + // Major version of OpenGL, initialised by OpenGL::Initialize() UInt8 ContextParameters::defaultMajorVersion; - // Version majeure d'OpenGL, initialisé par OpenGL::Initialize() + // Minor version of OpenGL, initialised by OpenGL::Initialize() UInt8 ContextParameters::defaultMinorVersion; - // Contexte de partage par défaut, initialisé par OpenGL::Initialize() + // Context of default sharing, initialised by OpenGL::Initialize() const Context* ContextParameters::defaultShareContext = nullptr; - // Si possible, garder la compatibilité avec les fonctionnalités dépréciées + // If it's possible, keep the compatibility with deprecated functionalities bool ContextParameters::defaultCompatibilityProfile = false; - // Mode debug d'OpenGL par défaut + // Default debug mode of OpenGL #if NAZARA_RENDERER_OPENGL_DEBUG || defined(NAZARA_DEBUG) bool ContextParameters::defaultDebugMode = true; #else bool ContextParameters::defaultDebugMode = false; #endif - // Active le double-buffering sur les contextes + // Enables double-buffering on contexts Active le double-buffering sur les contextes bool ContextParameters::defaultDoubleBuffered = false; - // Active le partage des ressources entre contextes (Via le defaultShareContext) + // Enables ressource sharing on contexts (via defaultShareContext) bool ContextParameters::defaultShared = true; } From 55d9a226656736f55887519f0ea473952a3fd76b Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 23 Feb 2017 00:09:39 +0100 Subject: [PATCH 3/3] NDK/BaseWidget: Children widgets are now automatically parented to their parent --- SDK/include/NDK/BaseWidget.inl | 1 + 1 file changed, 1 insertion(+) diff --git a/SDK/include/NDK/BaseWidget.inl b/SDK/include/NDK/BaseWidget.inl index 17592241f..e84a67a49 100644 --- a/SDK/include/NDK/BaseWidget.inl +++ b/SDK/include/NDK/BaseWidget.inl @@ -33,6 +33,7 @@ namespace Ndk inline void BaseWidget::AddChild(std::unique_ptr&& widget) { widget->Show(m_visible); + widget->SetParent(this); m_children.emplace_back(std::move(widget)); }