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

Utility: Rework cursors

Browse Source 
-Rename WindowCursor to SystemCursor
-Merged Cursor class with SystemCursor enum
This commit is contained in:
Lynix
2017-01-16 00:32:59 +01:00
parent 954298dc1e
commit f406068c45
16 changed files with 281 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,7 +90,7 @@ namespace Nz
// Paramètres par défaut
m_impl->EnableKeyRepeat(true);
m_impl->EnableSmoothScrolling(false);
m_impl->SetCursor(WindowCursor_Default);
m_impl->SetCursor(SystemCursor_Default);
m_impl->SetMaximumSize(-1, -1);
m_impl->SetMinimumSize(-1, -1);
m_impl->SetVisible(true);
@@ -350,34 +350,10 @@ namespace Nz
}
}
void Window::SetCursor(WindowCursor cursor)
{
#if NAZARA_UTILITY_SAFE
if (!m_impl)
{
NazaraError("Window not created");
return;
}
#endif
m_impl->SetCursor(cursor);
}
void Window::SetCursor(const Cursor& cursor)
{
#if NAZARA_UTILITY_SAFE
if (!m_impl)
{
NazaraError("Window not created");
return;
}
if (!cursor.IsValid())
{
NazaraError("Cursor is not valid");
return;
}
#endif
NazaraAssert(m_impl, "Window not created");
NazaraAssert(cursor.IsValid(), "Invalid cursor");
m_impl->SetCursor(cursor);
}