actually implement screen gap

This commit is contained in:
StapleButter 2017-11-08 01:34:11 +01:00
parent 5bea3cc530
commit 857ba49759

View File

@ -395,7 +395,7 @@ void SetupScreenRects(int width, int height)
// (also TODO: swap top/bottom screen if needed) // (also TODO: swap top/bottom screen if needed)
int screenW = 256; int screenW = 256;
int screenH = 192; int screenH = 192;
//horizontal = true; // TEST
if (horizontal) if (horizontal)
{ {
// side-by-side // side-by-side
@ -407,6 +407,8 @@ void SetupScreenRects(int width, int height)
int widthreq; int widthreq;
int startY = 0; int startY = 0;
height -= ScreenGap;
if (sizemode == 0) // even if (sizemode == 0) // even
{ {
widthreq = (height * screenW) / (screenH*2); widthreq = (height * screenW) / (screenH*2);
@ -443,8 +445,7 @@ void SetupScreenRects(int width, int height)
TopScreenRect.Y = startY; TopScreenRect.Y = startY;
TopScreenRect.X = (width - TopScreenRect.Width) / 2; TopScreenRect.X = (width - TopScreenRect.Width) / 2;
// TODO: gap BottomScreenRect.Y = TopScreenRect.Y + TopScreenRect.Height + ScreenGap;
BottomScreenRect.Y = TopScreenRect.Y + TopScreenRect.Height;
if (sizemode == 1) if (sizemode == 1)
{ {
@ -643,8 +644,25 @@ void OnOpenInputConfig(uiMenuItem* item, uiWindow* window, void* blarg)
void OnSetScreenGap(uiMenuItem* item, uiWindow* window, void* param) void OnSetScreenGap(uiMenuItem* item, uiWindow* window, void* param)
{ {
int gap = *(int*)param; int gap = *(int*)param;
int oldgap = ScreenGap;
ScreenGap = gap; ScreenGap = gap;
// TODO: check menu items!!!!!
// resize window as needed
// TODO: adapt to horizontal modes
// TODO: always resize window? except if it's maximized
int w, h;
uiWindowContentSize(window, &w, &h);
{
h -= gap;
if (h < 384)
{
h = 384 + gap;
uiWindowSetContentSize(window, w, h);
}
}
SetupScreenRects(Config::WindowWidth, Config::WindowHeight);
} }
void OnSetScreenLayout(uiMenuItem* item, uiWindow* window, void* param) void OnSetScreenLayout(uiMenuItem* item, uiWindow* window, void* param)