Merge default into minor

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-10-30 01:07:39 -03:00
13 changed files with 144 additions and 15 deletions
+5
View File
@@ -886,6 +886,11 @@ void Window::maximize()
}
}
bool Window::isMaximized() const
{
return window != nullptr && (SDL_GetWindowFlags(window) & SDL_WINDOW_MAXIMIZED);
}
void Window::swapBuffers()
{
SDL_GL_SwapWindow(window);
+2
View File
@@ -76,6 +76,8 @@ public:
void minimize();
void maximize();
bool isMaximized() const;
void swapBuffers();
bool hasFocus() const;