github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-25 14:22:54 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.cosmetics

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6954 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-02-25 19:31:55 +00:00
parent ad1b54ffc5
commit f3b14410eb
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
uppsrc/CtrlCore/GtkCtrl.cpp
View file

@ -42,7 +42,6 @@ String GuiPlatformGetKeyDesc(dword key)
{ K_DELTA|GDKEY(comma), "[,]" },
{ K_DELTA|GDKEY(period), "[.]" },
{ K_DELTA|GDKEY(underscore), "[/]" },
{ 0, NULL }
};
const Tuple2<dword, const char *> *x = FindTuple(nkey, __countof(nkey), key);
return x ? String(x->b) : String();

2
uppsrc/CtrlCore/GtkWnd.cpp
View file

@ -294,7 +294,7 @@ Rect Ctrl::GetPrimaryWorkArea()
int primary = gdk_screen_get_primary_monitor(gdk_screen_get_default());
Array<Rect> rc;
GetWorkArea(rc);
return primary < rc.GetCount() ? rc[primary] : GetVirtualScreenArea();
return primary >= 0 && primary < rc.GetCount() ? rc[primary] : GetVirtualScreenArea();
}
Rect Ctrl::GetPrimaryScreenArea()