ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix more sizing bugs

This commit is contained in:
StapleButter 2017-10-30 05:17:20 +01:00
parent f4e7e2f62a
commit 85d823d4c7
1 changed files with 13 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/libui_sdl/main.cpp
View File

@ -335,39 +335,8 @@ int OnAreaKeyEvent(uiAreaHandler* handler, uiArea* area, uiAreaKeyEvent* evt)
return 1; return 1;
} }
void OnAreaResize(uiAreaHandler* handler, uiArea* area, int width, int height) void SetupScreenRects(int width, int height)
{ {
float ratio = (height/2) / (float)width;
int availW, availH;
int startX, startY;
int screenW = 256;
int screenH = 384;
// TODO: "screw aspect ratio" option, I guess
/*if (ratio <= 0.75)
{
// bars on the sides
availW = (height * screenW) / screenH;
startX = (width - availW) / 2;
availH = height;
startY = 0;
}
else
{
availH = (width * screenH) / screenW;
startY = (height - availH) / 2;
availW = width;
startX = 0;
}*/
bool horizontal = false; bool horizontal = false;
if (ScreenLayout == 2) horizontal = true; if (ScreenLayout == 2) horizontal = true;
else if (ScreenLayout == 0) else if (ScreenLayout == 0)
@ -385,8 +354,10 @@ void OnAreaResize(uiAreaHandler* handler, uiArea* area, int width, int height)
sizemode = ScreenSizing; sizemode = ScreenSizing;
// blarg. // blarg.
screenW = 256; // should be changed if rotation is used
screenH = 192; // (also TODO: swap top/bottom screen if needed)
int screenW = 256;
int screenH = 192;
if (horizontal) if (horizontal)
{ {
@ -430,7 +401,7 @@ void OnAreaResize(uiAreaHandler* handler, uiArea* area, int width, int height)
else else
{ {
TopScreenRect.Width = widthreq; TopScreenRect.Width = widthreq;
TopScreenRect.Height = height - screenH; TopScreenRect.Height = (sizemode==0) ? (height / 2) : (height - screenH);
} }
TopScreenRect.Y = startY; TopScreenRect.Y = startY;
TopScreenRect.X = (width - TopScreenRect.Width) / 2; TopScreenRect.X = (width - TopScreenRect.Width) / 2;
@ -446,48 +417,15 @@ void OnAreaResize(uiAreaHandler* handler, uiArea* area, int width, int height)
else else
{ {
BottomScreenRect.Width = widthreq; BottomScreenRect.Width = widthreq;
BottomScreenRect.Height = height - screenH; BottomScreenRect.Height = height - TopScreenRect.Height;
} }
BottomScreenRect.X = (width - BottomScreenRect.Width) / 2; BottomScreenRect.X = (width - BottomScreenRect.Width) / 2;
} }
}
#if 0 void OnAreaResize(uiAreaHandler* handler, uiArea* area, int width, int height)
if (ratio <= 0.75) {
{ SetupScreenRects(width, height);
// bars on the sides
int targetW = (height * 256) / 384;
int barW = (width - targetW) / 2;
TopScreenRect.X = barW;
TopScreenRect.Width = targetW;
TopScreenRect.Y = 0;
TopScreenRect.Height = height / 2;
BottomScreenRect.X = barW;
BottomScreenRect.Width = targetW;
BottomScreenRect.Y = height / 2;
BottomScreenRect.Height = height / 2;
}
else
{
// TODO: this should do bars on the top, and fixed screen gap
// for now we'll adjust the screen gap in consequence
int targetH = (width * 384) / 256;
int gap = height - targetH;
TopScreenRect.X = 0;
TopScreenRect.Width = width;
TopScreenRect.Y = 0;
TopScreenRect.Height = targetH / 2;
BottomScreenRect.X = 0;
BottomScreenRect.Width = width;
BottomScreenRect.Y = (targetH / 2) + gap;
BottomScreenRect.Height = targetH / 2;
}
#endif
// TODO: // TODO:
// should those be the size of the uiArea, or the size of the window client area? // should those be the size of the uiArea, or the size of the window client area?
@ -683,6 +621,8 @@ void OnSetScreenSizing(uiMenuItem* item, uiWindow* window, void* param)
{ {
int sizing = *(int*)param; int sizing = *(int*)param;
ScreenSizing = sizing; ScreenSizing = sizing;
SetupScreenRects(Config::WindowWidth, Config::WindowHeight);
} }