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

Merge pull request #158 from retr0s4ge/master 

(Windows Frontend) Allow screen resizing in horizontal display layout.
This commit is contained in:
zeromus 2018-07-13 22:02:07 -04:00 committed by GitHub
parent 610caf0e45 43a9734ba2
commit 6fd23368ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 129 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
desmume/src/frontend/windows/main.cpp
View File

@ -519,6 +519,9 @@ bool continuousframeAdvancing = false;
unsigned short windowSize = 0; unsigned short windowSize = 0;
float screenSizeRatio = 1.0f;
bool vCenterResizedScr = true;
/*const u32 gapColors[16] = { /*const u32 gapColors[16] = {
Color::Gray, Color::Gray,
Color::Brown, Color::Brown,
@ -714,7 +717,9 @@ void ScaleScreen(float factor, bool user)
MainWindow->setClientSize((int)(video.rotatedwidthgap() * factor), (int)(video.rotatedheightgap() * factor)); MainWindow->setClientSize((int)(video.rotatedwidthgap() * factor), (int)(video.rotatedheightgap() * factor));
else else
if (video.layout == 1) if (video.layout == 1)
MainWindow->setClientSize((int)(video.rotatedwidthgap() * factor * 2), (int)(video.rotatedheightgap() * factor / 2)); {
MainWindow->setClientSize((int)(video.rotatedwidthgap() * factor * 2 / screenSizeRatio), (int)(video.rotatedheightgap() * factor / 2));
}
else else
if (video.layout == 2) if (video.layout == 2)
MainWindow->setClientSize((int)(video.rotatedwidthgap() * factor), (int)(video.rotatedheightgap() * factor / 2)); MainWindow->setClientSize((int)(video.rotatedwidthgap() * factor), (int)(video.rotatedheightgap() * factor / 2));
@ -868,22 +873,50 @@ void ToDSScreenRelativeCoords(s32& x, s32& y, int whichScreen)
{ {
bool topOnTop = (video.swap == 0) || (video.swap == 2 && isMainGPUFirst) || (video.swap == 3 && !isMainGPUFirst); bool topOnTop = (video.swap == 0) || (video.swap == 2 && isMainGPUFirst) || (video.swap == 3 && !isMainGPUFirst);
bool bottom = (whichScreen > 0); bool bottom = (whichScreen > 0);
if(topOnTop) if(topOnTop && bottom)
x += bottom ? -GPU_FRAMEBUFFER_NATIVE_WIDTH : 0; {
x = (x - GPU_FRAMEBUFFER_NATIVE_WIDTH * screenSizeRatio) / (2 - screenSizeRatio);
if(ForceRatio)
{
y *= screenSizeRatio / (2 - screenSizeRatio);
if (vCenterResizedScr)
y += GPU_FRAMEBUFFER_NATIVE_HEIGHT * (1 - screenSizeRatio) / (2 - screenSizeRatio);
}
}
else else
x += (x < GPU_FRAMEBUFFER_NATIVE_WIDTH) ? (bottom ? 0 : GPU_FRAMEBUFFER_NATIVE_WIDTH) : (bottom ? 0 : -GPU_FRAMEBUFFER_NATIVE_WIDTH); {
x /= screenSizeRatio;
if(!bottom)
{
if(x < GPU_FRAMEBUFFER_NATIVE_WIDTH)
x += GPU_FRAMEBUFFER_NATIVE_WIDTH;
else
x += -GPU_FRAMEBUFFER_NATIVE_WIDTH;
}
}
} }
else else
{ {
if(x >= GPU_FRAMEBUFFER_NATIVE_WIDTH) if(x >= GPU_FRAMEBUFFER_NATIVE_WIDTH * screenSizeRatio)
{ {
x -= GPU_FRAMEBUFFER_NATIVE_WIDTH; x = (x - GPU_FRAMEBUFFER_NATIVE_WIDTH * screenSizeRatio) / (2 - screenSizeRatio);
if(ForceRatio)
{
y *= screenSizeRatio / (2 - screenSizeRatio);
if (vCenterResizedScr)
y += GPU_FRAMEBUFFER_NATIVE_HEIGHT * (1 - screenSizeRatio) / (2 - screenSizeRatio);
}
y += GPU_FRAMEBUFFER_NATIVE_HEIGHT; y += GPU_FRAMEBUFFER_NATIVE_HEIGHT;
if(y < GPU_FRAMEBUFFER_NATIVE_HEIGHT)
y = GPU_FRAMEBUFFER_NATIVE_HEIGHT;
} }
else if(x < 0) else
{ {
x += GPU_FRAMEBUFFER_NATIVE_WIDTH; x /= screenSizeRatio;
y -= GPU_FRAMEBUFFER_NATIVE_HEIGHT; if(x < 0)
x = 0;
if(y > GPU_FRAMEBUFFER_NATIVE_HEIGHT)
y = GPU_FRAMEBUFFER_NATIVE_HEIGHT;
} }
} }
} }
@ -1161,14 +1194,15 @@ void UpdateWndRects(HWND hwnd)
if (video.layout == 1) //horizontal if (video.layout == 1) //horizontal
{ {
rc = CalculateDisplayLayoutWrapper(rc, GPU_FRAMEBUFFER_NATIVE_WIDTH * 2, GPU_FRAMEBUFFER_NATIVE_HEIGHT, tbheight, maximized); rc = CalculateDisplayLayoutWrapper(rc, (int)((float)GPU_FRAMEBUFFER_NATIVE_WIDTH * 2 / screenSizeRatio), GPU_FRAMEBUFFER_NATIVE_HEIGHT, tbheight, maximized);
wndWidth = (rc.bottom - rc.top) - tbheight; wndWidth = (rc.bottom - rc.top) - tbheight;
wndHeight = (rc.right - rc.left); wndHeight = (rc.right - rc.left);
ratio = ((float)wndHeight / (float)512); ratio = ((float)wndHeight / (float)512);
oneScreenHeight = (int)((float)GPU_FRAMEBUFFER_NATIVE_WIDTH * ratio); oneScreenHeight = (int)((float)GPU_FRAMEBUFFER_NATIVE_WIDTH * ratio);
int oneScreenWidth = (int)((float)GPU_FRAMEBUFFER_NATIVE_HEIGHT * ratio); int oneScreenWidth = (int)((float)GPU_FRAMEBUFFER_NATIVE_HEIGHT * ratio);
int vResizedScrOffset = 0;
// Main screen // Main screen
ptClient.x = rc.left; ptClient.x = rc.left;
@ -1176,20 +1210,25 @@ void UpdateWndRects(HWND hwnd)
ClientToScreen(hwnd, &ptClient); ClientToScreen(hwnd, &ptClient);
MainScreenRect.left = ptClient.x; MainScreenRect.left = ptClient.x;
MainScreenRect.top = ptClient.y; MainScreenRect.top = ptClient.y;
ptClient.x = (rc.left + oneScreenHeight); ptClient.x = (rc.left + oneScreenHeight * screenSizeRatio);
ptClient.y = (rc.top + wndWidth); ptClient.y = (rc.top + wndWidth);
ClientToScreen(hwnd, &ptClient); ClientToScreen(hwnd, &ptClient);
MainScreenRect.right = ptClient.x; MainScreenRect.right = ptClient.x;
MainScreenRect.bottom = ptClient.y; MainScreenRect.bottom = ptClient.y;
// Sub screen // Sub screen
ptClient.x = (rc.left + oneScreenHeight); ptClient.x = (rc.left + oneScreenHeight * screenSizeRatio);
ptClient.y = rc.top; if(vCenterResizedScr && ForceRatio)
vResizedScrOffset = (wndWidth - oneScreenWidth * (2 - screenSizeRatio)) / 2;
ptClient.y = rc.top + vResizedScrOffset;
ClientToScreen(hwnd, &ptClient); ClientToScreen(hwnd, &ptClient);
SubScreenRect.left = ptClient.x; SubScreenRect.left = ptClient.x;
SubScreenRect.top = ptClient.y; SubScreenRect.top = ptClient.y;
ptClient.x = (rc.left + oneScreenHeight + oneScreenHeight); ptClient.x = (rc.left + oneScreenHeight * 2);
ptClient.y = (rc.top + wndWidth); if(ForceRatio)
ptClient.y = (rc.top + vResizedScrOffset + oneScreenWidth * (2 - screenSizeRatio));
else
ptClient.y = (rc.top + wndWidth);
ClientToScreen(hwnd, &ptClient); ClientToScreen(hwnd, &ptClient);
SubScreenRect.right = ptClient.x; SubScreenRect.right = ptClient.x;
SubScreenRect.bottom = ptClient.y; SubScreenRect.bottom = ptClient.y;
@ -1913,6 +1952,11 @@ static void DD_DoDisplay()
DD_FillRect(ddraw.surface.primary,0,bottom,left,wr.bottom,RGB(0,0,128)); //bottomleft DD_FillRect(ddraw.surface.primary,0,bottom,left,wr.bottom,RGB(0,0,128)); //bottomleft
DD_FillRect(ddraw.surface.primary,left,bottom,right,wr.bottom,RGB(255,0,255)); //bottomcenter DD_FillRect(ddraw.surface.primary,left,bottom,right,wr.bottom,RGB(255,0,255)); //bottomcenter
DD_FillRect(ddraw.surface.primary,right,bottom,wr.right,wr.bottom,RGB(0,255,255)); //bottomright DD_FillRect(ddraw.surface.primary,right,bottom,wr.right,wr.bottom,RGB(0,255,255)); //bottomright
if (video.layout == 1)
{
DD_FillRect(ddraw.surface.primary, SubScreenRect.left, wr.top, wr.right, SubScreenRect.top, RGB(0, 0, 0)); //Top gap left when centering the resized screen
DD_FillRect(ddraw.surface.primary, SubScreenRect.left, SubScreenRect.bottom, wr.right, wr.bottom, RGB(0, 0, 0)); //Bottom gap left when centering the resized screen
}
} }
} }
@ -3008,6 +3052,7 @@ int _main()
msgbox = &msgBoxWnd; msgbox = &msgBoxWnd;
char text[80] = {0}; char text[80] = {0};
char scrRatStr[4] = "1.0";
path.ReadPathSettings(); path.ReadPathSettings();
@ -3071,6 +3116,9 @@ int _main()
GetPrivateProfileString("MicSettings", "MicSampleFile", "micsample.raw", MicSampleName, MAX_PATH, IniName); GetPrivateProfileString("MicSettings", "MicSampleFile", "micsample.raw", MicSampleName, MAX_PATH, IniName);
RefreshMicSettings(); RefreshMicSettings();
GetPrivateProfileString("Display", "Screen Size Ratio", "1.0", scrRatStr, 4, IniName);
screenSizeRatio = atof(scrRatStr);
vCenterResizedScr = GetPrivateProfileBool("Display", "Vertically Center Resized Screen", 1, IniName);
video.screengap = GetPrivateProfileInt("Display", "ScreenGap", 0, IniName); video.screengap = GetPrivateProfileInt("Display", "ScreenGap", 0, IniName);
SeparationBorderDrag = GetPrivateProfileBool("Display", "Window Split Border Drag", true, IniName); SeparationBorderDrag = GetPrivateProfileBool("Display", "Window Split Border Drag", true, IniName);
ScreenGapColor = GetPrivateProfileInt("Display", "ScreenGapColor", 0xFFFFFF, IniName); ScreenGapColor = GetPrivateProfileInt("Display", "ScreenGapColor", 0xFFFFFF, IniName);
@ -4629,6 +4677,22 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
MainWindow->checkMenu(IDM_ALWAYS_ON_TOP, (GetStyle()&DWS_ALWAYSONTOP)!=0); MainWindow->checkMenu(IDM_ALWAYS_ON_TOP, (GetStyle()&DWS_ALWAYSONTOP)!=0);
MainWindow->checkMenu(IDM_LOCKDOWN, (GetStyle()&DWS_LOCKDOWN)!=0); MainWindow->checkMenu(IDM_LOCKDOWN, (GetStyle()&DWS_LOCKDOWN)!=0);
//Screen Size Ratio
MainWindow->checkMenu(IDC_SCR_RATIO_1p0, ((int)(screenSizeRatio*10)==10));
MainWindow->checkMenu(IDC_SCR_RATIO_1p1, ((int)(screenSizeRatio*10)==11));
MainWindow->checkMenu(IDC_SCR_RATIO_1p2, ((int)(screenSizeRatio*10)==12));
MainWindow->checkMenu(IDC_SCR_RATIO_1p3, ((int)(screenSizeRatio*10)==13));
MainWindow->checkMenu(IDC_SCR_RATIO_1p4, ((int)(screenSizeRatio*10)==14));
MainWindow->checkMenu(IDC_SCR_RATIO_1p5, ((int)(screenSizeRatio*10)==15));
MainWindow->checkMenu(IDC_SCR_VCENTER, (vCenterResizedScr == 1));
DesEnableMenuItem(mainMenu, IDC_SCR_RATIO_1p0, (video.layout == 1));
DesEnableMenuItem(mainMenu, IDC_SCR_RATIO_1p1, (video.layout == 1));
DesEnableMenuItem(mainMenu, IDC_SCR_RATIO_1p2, (video.layout == 1));
DesEnableMenuItem(mainMenu, IDC_SCR_RATIO_1p3, (video.layout == 1));
DesEnableMenuItem(mainMenu, IDC_SCR_RATIO_1p4, (video.layout == 1));
DesEnableMenuItem(mainMenu, IDC_SCR_RATIO_1p5, (video.layout == 1));
DesEnableMenuItem(mainMenu, IDC_SCR_VCENTER, (video.layout == 1));
//Screen Separation //Screen Separation
MainWindow->checkMenu(IDM_SCREENSEP_NONE, ((video.screengap==kGapNone))); MainWindow->checkMenu(IDM_SCREENSEP_NONE, ((video.screengap==kGapNone)));
MainWindow->checkMenu(IDM_SCREENSEP_BORDER, ((video.screengap==kGapBorder))); MainWindow->checkMenu(IDM_SCREENSEP_BORDER, ((video.screengap==kGapBorder)));
@ -4920,7 +4984,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
else if (video.layout == 1) else if (video.layout == 1)
{ {
minX = video.rotatedwidthgap() * 2; minX = video.rotatedwidthgap() * 2;
minY = video.rotatedheightgap() / 2; minY = video.rotatedheightgap() * screenSizeRatio / 2;
} }
else if (video.layout == 2) else if (video.layout == 2)
{ {
@ -6278,6 +6342,34 @@ DOKEYDOWN:
WritePrivateProfileInt("Video","Window Size",windowSize,IniName); WritePrivateProfileInt("Video","Window Size",windowSize,IniName);
break; break;
case IDC_SCR_RATIO_1p0:
case IDC_SCR_RATIO_1p1:
case IDC_SCR_RATIO_1p2:
case IDC_SCR_RATIO_1p3:
case IDC_SCR_RATIO_1p4:
case IDC_SCR_RATIO_1p5:
{
screenSizeRatio = LOWORD(wParam) - IDC_SCR_RATIO_1p0;
screenSizeRatio = screenSizeRatio * 0.1 + 1;
RECT rc;
GetClientRect(hwnd, &rc);
MainWindow->setClientSize((int)((rc.right - rc.left + 8) / screenSizeRatio), rc.bottom - rc.top);
char scrRatStr[4] = "1.0";
sprintf(scrRatStr, "%.1f", screenSizeRatio);
WritePrivateProfileString("Display", "Screen Size Ratio", scrRatStr, IniName);
}
return 0;
case IDC_SCR_VCENTER:
{
vCenterResizedScr = (!vCenterResizedScr) ? TRUE : FALSE;
UpdateWndRects(hwnd);
WritePrivateProfileInt("Display", "Vertically Center Resized Screen", vCenterResizedScr, IniName);
}
return 0;
case IDC_VIEW_PADTOINTEGER: case IDC_VIEW_PADTOINTEGER:
PadToInteger = (!PadToInteger)?TRUE:FALSE; PadToInteger = (!PadToInteger)?TRUE:FALSE;
WritePrivateProfileInt("Video","Window Pad To Integer",PadToInteger,IniName); WritePrivateProfileInt("Video","Window Pad To Integer",PadToInteger,IniName);
@ -6286,6 +6378,7 @@ DOKEYDOWN:
case IDC_FORCERATIO: case IDC_FORCERATIO:
ForceRatio = (!ForceRatio)?TRUE:FALSE; ForceRatio = (!ForceRatio)?TRUE:FALSE;
if((int)(screenSizeRatio * 10) > 10) UpdateWndRects(hwnd);
if(ForceRatio) if(ForceRatio)
FixAspectRatio(); FixAspectRatio();
WritePrivateProfileInt("Video","Window Force Ratio",ForceRatio,IniName); WritePrivateProfileInt("Video","Window Force Ratio",ForceRatio,IniName);

9
desmume/src/frontend/windows/resource.h
View File

@ -958,6 +958,13 @@
#define IDM_RENDER_3XBRZ 40123 #define IDM_RENDER_3XBRZ 40123
#define IDM_RENDER_4XBRZ 40124 #define IDM_RENDER_4XBRZ 40124
#define IDM_RENDER_5XBRZ 40125 #define IDM_RENDER_5XBRZ 40125
#define IDC_SCR_RATIO_1p0 40143
#define IDC_SCR_RATIO_1p1 40144
#define IDC_SCR_RATIO_1p2 40145
#define IDC_SCR_RATIO_1p3 40146
#define IDC_SCR_RATIO_1p4 40147
#define IDC_SCR_RATIO_1p5 40148
#define IDC_SCR_VCENTER 40149
#define ID_LABEL_HK3b 44670 #define ID_LABEL_HK3b 44670
#define ID_LABEL_HK3c 44671 #define ID_LABEL_HK3c 44671
#define ID_LABEL_HK3d 44672 #define ID_LABEL_HK3d 44672
@ -1072,7 +1079,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 1 #define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 128 #define _APS_NEXT_RESOURCE_VALUE 128
#define _APS_NEXT_COMMAND_VALUE 40126 #define _APS_NEXT_COMMAND_VALUE 40150
#define _APS_NEXT_CONTROL_VALUE 1065 #define _APS_NEXT_CONTROL_VALUE 1065
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif

11
desmume/src/frontend/windows/resources.rc
View File

@ -1609,6 +1609,17 @@ BEGIN
MENUITEM "&Always On Top", IDM_ALWAYS_ON_TOP MENUITEM "&Always On Top", IDM_ALWAYS_ON_TOP
MENUITEM "&Lockdown", IDM_LOCKDOWN MENUITEM "&Lockdown", IDM_LOCKDOWN
END END
POPUP "Screen Size Ratio (L:R)"
BEGIN
MENUITEM "1.0 : 1.0", IDC_SCR_RATIO_1p0
MENUITEM "1.1 : 0.9", IDC_SCR_RATIO_1p1
MENUITEM "1.2 : 0.8", IDC_SCR_RATIO_1p2
MENUITEM "1.3 : 0.7", IDC_SCR_RATIO_1p3
MENUITEM "1.4 : 0.6", IDC_SCR_RATIO_1p4
MENUITEM "1.5 : 0.5", IDC_SCR_RATIO_1p5
MENUITEM SEPARATOR
MENUITEM "Center Vertically", IDC_SCR_VCENTER
END
POPUP "Screen &Gap" POPUP "Screen &Gap"
BEGIN BEGIN
MENUITEM "&None\t(0 px)", IDM_SCREENSEP_NONE MENUITEM "&None\t(0 px)", IDM_SCREENSEP_NONE