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

SDK: Fix console layer having trouble with late constructed windows 

Former-commit-id: e5882089bc09649b545da8ea8a222b89417851a0 [formerly 1a114b80d1a97b96e764a2732ce8200244389283] [formerly f36d163b9d5a52c2958468dd26d9086b86c6710b [formerly 71b9edd9938eb30860da96234605a001173eaa23]]
Former-commit-id: 8fd9120c8333c10f95d66d859eef2c64c58efc28 [formerly 423c0088ec020881cbf207470787d86929f34fd4]
Former-commit-id: e283df698adfb17f2d40156ad411e9a6acac1f7a
This commit is contained in:
Lynix 2016-08-29 02:33:57 +02:00
parent dacbc4fd88
commit 79db960a89
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SDK/include/NDK/Application.hpp
View File

@ -88,7 +88,7 @@ namespace Ndk
NazaraSlot(Nz::EventHandler, OnEvent, eventSlot); NazaraSlot(Nz::EventHandler, OnEvent, eventSlot);
NazaraSlot(Nz::EventHandler, OnKeyPressed, keyPressedSlot); NazaraSlot(Nz::EventHandler, OnKeyPressed, keyPressedSlot);
NazaraSlot(Nz::EventHandler, OnResized, resizedSlot); NazaraSlot(Nz::RenderTarget, OnRenderTargetSizeChange, resizedSlot);
NazaraSlot(Nz::Log, OnLogWrite, logSlot); NazaraSlot(Nz::Log, OnLogWrite, logSlot);
}; };

13
SDK/src/NDK/Application.cpp
View File

@ -144,9 +144,16 @@ namespace Ndk
{ {
std::unique_ptr<ConsoleOverlay> overlay = std::make_unique<ConsoleOverlay>(); std::unique_ptr<ConsoleOverlay> overlay = std::make_unique<ConsoleOverlay>();
overlay->console = std::make_unique<Console>(*info.overlayWorld, Nz::Vector2f(Nz::Vector2ui(info.window->GetWidth(), info.window->GetHeight() / 4)), overlay->lua); Nz::Vector2ui windowDimensions;
if (info.window->IsValid())
windowDimensions.Set(info.window->GetWidth(), info.window->GetHeight() / 4);
else
windowDimensions.MakeZero();
overlay->console = std::make_unique<Console>(*info.overlayWorld, Nz::Vector2f(windowDimensions), overlay->lua);
Console& consoleRef = *overlay->console; Console& consoleRef = *overlay->console;
// Redirect logs toward the console // Redirect logs toward the console
overlay->logSlot.Connect(Nz::Log::OnLogWrite, [&consoleRef] (const Nz::String& str) overlay->logSlot.Connect(Nz::Log::OnLogWrite, [&consoleRef] (const Nz::String& str)
{ {
@ -201,9 +208,9 @@ namespace Ndk
consoleRef.Show(!consoleRef.IsVisible()); consoleRef.Show(!consoleRef.IsVisible());
}); });
overlay->resizedSlot.Connect(eventHandler.OnResized, [&consoleRef] (const Nz::EventHandler*, const Nz::WindowEvent::SizeEvent& event) overlay->resizedSlot.Connect(info.renderTarget->OnRenderTargetSizeChange, [&consoleRef] (const Nz::RenderTarget* renderTarget)
{ {
consoleRef.SetSize({float(event.width), event.height / 4.f}); consoleRef.SetSize({float(renderTarget->GetWidth()), renderTarget->GetHeight() / 4.f});
}); });
info.console = std::move(overlay); info.console = std::move(overlay);

18
src/Nazara/Utility/Window.cpp
View File

@ -3,6 +3,7 @@
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Utility/Window.hpp> #include <Nazara/Utility/Window.hpp>
#include <Nazara/Core/CallOnExit.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Core/ErrorFlags.hpp> #include <Nazara/Core/ErrorFlags.hpp>
#include <Nazara/Core/LockGuard.hpp> #include <Nazara/Core/LockGuard.hpp>
@ -60,25 +61,22 @@ namespace Nz
else if (style & WindowStyle_Closable || style & WindowStyle_Resizable) else if (style & WindowStyle_Closable || style & WindowStyle_Resizable)
style |= WindowStyle_Titlebar; style |= WindowStyle_Titlebar;
m_impl = new WindowImpl(this); std::unique_ptr<WindowImpl> impl = std::make_unique<WindowImpl>(this);
if (!m_impl->Create(mode, title, style)) if (!impl->Create(mode, title, style))
{ {
NazaraError("Failed to create window implementation"); NazaraError("Failed to create window implementation");
delete m_impl;
m_impl = nullptr;
return false; return false;
} }
m_impl = impl.release();
CallOnExit destroyOnFailure([this] () { Destroy(); });
m_closed = false; m_closed = false;
m_ownsWindow = true; m_ownsWindow = true;
if (!OnWindowCreated()) if (!OnWindowCreated())
{ {
NazaraError("Failed to initialize window extension"); NazaraError("Failed to initialize window extension");
delete m_impl;
m_impl = nullptr;
return false; return false;
} }
@ -93,6 +91,10 @@ namespace Nz
if (opened) if (opened)
m_impl->SetPosition(position.x, position.y); m_impl->SetPosition(position.x, position.y);
OnWindowResized();
destroyOnFailure.Reset();
return true; return true;
} }