Merged default into minor

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2014-07-08 14:01:55 -03:00
21 changed files with 177 additions and 48 deletions
+2
View File
@@ -108,6 +108,8 @@ public:
virtual bool setIcon(love::image::ImageData *imgd) = 0;
virtual love::image::ImageData *getIcon() = 0;
virtual void minimize() = 0;
// default no-op implementation
virtual void swapBuffers();
+6
View File
@@ -591,6 +591,12 @@ love::image::ImageData *Window::getIcon()
return curMode.icon;
}
void Window::minimize()
{
if (window != nullptr)
SDL_MinimizeWindow(window);
}
void Window::swapBuffers()
{
SDL_GL_SwapWindow(window);
+2
View File
@@ -65,6 +65,8 @@ public:
bool setIcon(love::image::ImageData *imgd);
love::image::ImageData *getIcon();
void minimize();
void swapBuffers();
bool hasFocus() const;
+7
View File
@@ -308,6 +308,12 @@ int w_getPixelScale(lua_State *L)
return 1;
}
int w_minimize(lua_State* /*L*/)
{
instance->minimize();
return 0;
}
static const luaL_Reg functions[] =
{
{ "getDisplayCount", w_getDisplayCount },
@@ -327,6 +333,7 @@ static const luaL_Reg functions[] =
{ "hasMouseFocus", w_hasMouseFocus },
{ "isVisible", w_isVisible },
{ "getPixelScale", w_getPixelScale },
{ "minimize", w_minimize },
{ 0, 0 }
};
+1
View File
@@ -46,6 +46,7 @@ int w_hasFocus(lua_State *L);
int w_hasMouseFocus(lua_State *L);
int w_isVisible(lua_State *L);
int w_getPixelScale(lua_State *L);
int w_minimize(lua_State *L);
extern "C" LOVE_EXPORT int luaopen_love_window(lua_State *L);
} // window