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

- Instead of (De)magnify, new options for Window Sizes (1x-4x)

This commit is contained in:
amponzi 2007-01-26 08:08:01 +00:00
parent adc1ef6ea4
commit 0d7cfed8a6
3 changed files with 57 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
desmume/src/windows/main.c
View File

@ -80,6 +80,8 @@ BOOL romloaded = FALSE;
BOOL ForceRatio = FALSE; BOOL ForceRatio = FALSE;
float aspectratio; float aspectratio;
int DefaultWidth;
int DefaultHeight;
HMENU menu; HMENU menu;
HANDLE runthread=INVALID_HANDLE_VALUE; HANDLE runthread=INVALID_HANDLE_VALUE;
@ -201,14 +203,16 @@ void SetWindowClientSize(HWND hwnd, int cx, int cy) //found at: http://blogs.msd
void ScaleScreen(float factor) void ScaleScreen(float factor)
{ {
RECT fullSize,clientSize ; /* RECT fullSize,clientSize ;
factor -= 1 ; factor -= 1 ;
GetWindowRect(hwnd,&fullSize) ; GetWindowRect(hwnd,&fullSize) ;
GetClientRect(hwnd,&clientSize) ; GetClientRect(hwnd,&clientSize) ;
fullSize.right += (clientSize.right - clientSize.left) * factor ; fullSize.right += (clientSize.right - clientSize.left) * factor ;
fullSize.bottom += (clientSize.bottom - clientSize.top) * factor ; fullSize.bottom += (clientSize.bottom - clientSize.top) * factor ; */
SetWindowPos(hwnd, NULL, 0, 0, fullSize.right - fullSize.left, //SetWindowPos(hwnd, NULL, 0, 0, fullSize.right - fullSize.left,
fullSize.bottom - fullSize.top, SWP_NOMOVE | SWP_NOZORDER); // fullSize.bottom - fullSize.top, SWP_NOMOVE | SWP_NOZORDER);
SetWindowPos(hwnd, NULL, 0, 0, DefaultWidth * factor,
DefaultHeight * factor, SWP_NOMOVE | SWP_NOZORDER);
} }
void translateXY(s32 *x, s32*y) void translateXY(s32 *x, s32*y)
@ -551,13 +555,15 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
switch (message) // handle the messages switch (message) // handle the messages
{ {
case WM_CREATE: case WM_CREATE:
{ {
RECT fullSize; RECT fullSize;
ReadConfig(); ReadConfig();
GetWindowRect(hwnd, &fullSize); GetWindowRect(hwnd, &fullSize);
aspectratio = ((fullSize.right - fullSize.left) * 1.0) / ((fullSize.bottom - fullSize.top) * 1.0); DefaultWidth = fullSize.right - fullSize.left;
return 0; DefaultHeight = fullSize.bottom - fullSize.top;
} aspectratio = ((fullSize.right - fullSize.left) * 1.0) / ((fullSize.bottom - fullSize.top) * 1.0);
return 0;
}
case WM_DESTROY: case WM_DESTROY:
NDS_Pause(); NDS_Pause();
finished = TRUE; finished = TRUE;
@ -1350,12 +1356,24 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
CheckMenuItem(menu, IDC_ROTATE180, MF_BYCOMMAND | MF_UNCHECKED); CheckMenuItem(menu, IDC_ROTATE180, MF_BYCOMMAND | MF_UNCHECKED);
CheckMenuItem(menu, IDC_ROTATE270, MF_BYCOMMAND | MF_CHECKED); CheckMenuItem(menu, IDC_ROTATE270, MF_BYCOMMAND | MF_CHECKED);
return 0; return 0;
case IDC_MAGNIFY: /*case IDC_MAGNIFY:
ScaleScreen(1.25f) ; /* 100 -> 125% */ ScaleScreen(1.25f) ; //100 -> 125%
break ; break ;
case IDC_DEMAGNIFY: case IDC_DEMAGNIFY:
ScaleScreen(0.8f) ; /* 125 -> 100% (== 100 -> 80%) */ ScaleScreen(0.8f) ; //125 -> 100% (== 100 -> 80%)
break ; break ; */
case IDC_WINDOW1X:
ScaleScreen(1);
break;
case IDC_WINDOW2X:
ScaleScreen(2);
break;
case IDC_WINDOW3X:
ScaleScreen(3);
break;
case IDC_WINDOW4X:
ScaleScreen(4);
break;
case IDC_FORCERATIO: case IDC_FORCERATIO:
if (ForceRatio) { if (ForceRatio) {
CheckMenuItem(menu, IDC_FORCERATIO, MF_BYCOMMAND | MF_UNCHECKED); CheckMenuItem(menu, IDC_FORCERATIO, MF_BYCOMMAND | MF_UNCHECKED);

8
desmume/src/windows/resource.h
View File

@ -224,8 +224,12 @@ void refreshAll();
#define IDC_ROTATE90 1004 #define IDC_ROTATE90 1004
#define IDC_ROTATE180 1005 #define IDC_ROTATE180 1005
#define IDC_ROTATE270 1006 #define IDC_ROTATE270 1006
#define IDC_MAGNIFY 1007 //#define IDC_MAGNIFY 1007
#define IDC_DEMAGNIFY 1008 //#define IDC_DEMAGNIFY 1008
#define IDC_FORCERATIO 1009 #define IDC_FORCERATIO 1009
#define IDC_WINDOW1X 1010
#define IDC_WINDOW2X 1011
#define IDC_WINDOW3X 1012
#define IDC_WINDOW4X 1013
#endif #endif

22
desmume/src/windows/resources.rc
View File

@ -57,8 +57,15 @@ MENU_PRINCIPAL MENU
MENUITEM "180", IDC_ROTATE180 MENUITEM "180", IDC_ROTATE180
MENUITEM "270", IDC_ROTATE270 MENUITEM "270", IDC_ROTATE270
} }
MENUITEM "&Magnify", IDC_MAGNIFY POPUP "Window &Size"
MENUITEM "&DeMagnify", IDC_DEMAGNIFY {
MENUITEM "1x", IDC_WINDOW1X
MENUITEM "2x", IDC_WINDOW2X
MENUITEM "3x", IDC_WINDOW3X
MENUITEM "4x", IDC_WINDOW4X
}
//MENUITEM "&Magnify", IDC_MAGNIFY
//MENUITEM "&DeMagnify", IDC_DEMAGNIFY
MENUITEM "&Force Maintain Ratio", IDC_FORCERATIO MENUITEM "&Force Maintain Ratio", IDC_FORCERATIO
} }
POPUP "&Outils" POPUP "&Outils"
@ -357,8 +364,15 @@ MENU_PRINCIPAL MENU
MENUITEM "180", IDC_ROTATE180 MENUITEM "180", IDC_ROTATE180
MENUITEM "270", IDC_ROTATE270 MENUITEM "270", IDC_ROTATE270
} }
MENUITEM "&Magnify", IDC_MAGNIFY POPUP "Window &Size"
MENUITEM "&DeMagnify", IDC_DEMAGNIFY {
MENUITEM "1x", IDC_WINDOW1X
MENUITEM "2x", IDC_WINDOW2X
MENUITEM "3x", IDC_WINDOW3X
MENUITEM "4x", IDC_WINDOW4X
}
//MENUITEM "&Magnify", IDC_MAGNIFY
//MENUITEM "&DeMagnify", IDC_DEMAGNIFY
MENUITEM "&Force Maintain Ratio", IDC_FORCERATIO MENUITEM "&Force Maintain Ratio", IDC_FORCERATIO
} }
POPUP "&Config" POPUP "&Config"