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

Utility/Window: Make Window moveable

Browse Source 
Former-commit-id: 8c780562acc61d15437ed21c16eed92b6dd97373
This commit is contained in:
Lynix
2016-03-01 14:00:53 +01:00
parent 40e12ebffa
commit 36067e31c4
3 changed files with 166 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,53 +28,6 @@ namespace Nz
Window* fullscreenWindow = nullptr;
}
Window::Window() :
#if NAZARA_UTILITY_THREADED_WINDOW
m_impl(nullptr),
m_eventListener(true),
m_waitForEvent(false)
#else
m_impl(nullptr)
#endif
{
}
Window::Window(VideoMode mode, const String& title, UInt32 style) :
#if NAZARA_UTILITY_THREADED_WINDOW
m_impl(nullptr),
m_eventListener(true),
m_waitForEvent(false)
#else
m_impl(nullptr)
#endif
{
ErrorFlags flags(ErrorFlag_ThrowException, true);
Create(mode, title, style);
}
Window::Window(WindowHandle handle) :
#if NAZARA_UTILITY_THREADED_WINDOW
m_impl(nullptr),
m_eventListener(true),
m_waitForEvent(false)
#else
m_impl(nullptr)
#endif
{
ErrorFlags flags(ErrorFlag_ThrowException, true);
Create(handle);
}
Window::~Window()
{
Destroy();
}
void Window::Close()
{
m_closed = true; // On retarde la fermeture jusqu'au prochain IsOpen
}
bool Window::Create(VideoMode mode, const String& title, UInt32 style)
{
// Si la fenêtre est déjà ouverte, nous conservons sa position
@@ -317,27 +270,6 @@ namespace Nz
return m_impl->HasFocus();
}
bool Window::IsOpen(bool checkClosed)
{
if (m_impl)
{
if (m_closed && checkClosed)
{
Destroy();
return false;
}
else
return true;
}
else
return false;
}
bool Window::IsOpen() const
{
return m_impl != nullptr;
}
bool Window::IsMinimized() const
{
#if NAZARA_UTILITY_SAFE
@@ -351,11 +283,6 @@ namespace Nz
return m_impl->IsMinimized();
}
bool Window::IsValid() const
{
return m_impl != nullptr;
}
bool Window::IsVisible() const
{
#if NAZARA_UTILITY_SAFE
@@ -710,28 +637,6 @@ namespace Nz
m_impl->IgnoreNextMouseEvent(mouseX, mouseY);
}
void Window::PushEvent(const WindowEvent& event)
{
#if NAZARA_UTILITY_THREADED_WINDOW
m_eventMutex.Lock();
#endif
m_events.push(event);
if (event.type == WindowEventType_Resized)
OnWindowResized();
#if NAZARA_UTILITY_THREADED_WINDOW
m_eventMutex.Unlock();
if (m_waitForEvent)
{
m_eventConditionMutex.Lock();
m_eventCondition.Signal();
m_eventConditionMutex.Unlock();
}
#endif
}
bool Window::Initialize()
{
return WindowImpl::Initialize();