From b9395814aee48447c2a0b7d4fb1bbb50fece8e27 Mon Sep 17 00:00:00 2001 From: OV2 Date: Thu, 23 Mar 2023 12:14:27 +0100 Subject: [PATCH] win32: align display dialog checkbox positions, adjust tab order --- win32/rsrc/snes9x.rc | 90 ++++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/win32/rsrc/snes9x.rc b/win32/rsrc/snes9x.rc index 87b1670c..b93853ad 100644 --- a/win32/rsrc/snes9x.rc +++ b/win32/rsrc/snes9x.rc @@ -179,60 +179,60 @@ BEGIN CONTROL "Sync By Reset",IDC_SYNCBYRESET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,90,172,15 END -IDD_NEWDISPLAY DIALOGEX 0, 0, 348, 290 +IDD_NEWDISPLAY DIALOGEX 0, 0, 349, 297 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION CAPTION "Display Settings" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK",IDOK,240,270,48,14 - PUSHBUTTON "Cancel",IDCANCEL,294,270,48,14 + DEFPUSHBUTTON "OK",IDOK,240,275,48,14 + PUSHBUTTON "Cancel",IDCANCEL,294,275,48,14 COMBOBOX IDC_OUTPUTMETHOD,72,17,95,58,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Fullscreen",IDC_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,30,50,10 - CONTROL "Emulate Fullscreen",IDC_EMUFULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,41,75,10 - CONTROL "Stretch Image",IDC_STRETCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,52,60,10 - CONTROL "Maintain Aspect Ratio",IDC_ASPECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,63,85,10 - COMBOBOX IDC_ASPECTDROP,102,63,65,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Integer Scaling",IDC_INTEGERSCALING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,74,75,10 - CONTROL "Bilinear Filtering",IDC_BILINEAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,85,75,10 - CONTROL "Show Frame Rate",IDC_SHOWFPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,96,73,10 - CONTROL "Automatic, skip at most:",IDC_AUTOFRAME,"Button",BS_AUTORADIOBUTTON,12,150,122,12 - CONTROL "Fixed, always skip:",IDC_FIXEDSKIP,"Button",BS_AUTORADIOBUTTON,12,168,121,12 - EDITTEXT IDC_MAXSKIP,138,149,29,14,ES_AUTOHSCROLL | ES_NUMBER - CONTROL "",IDC_SPIN_MAX_SKIP_DISP,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,156,149,12,14 - EDITTEXT IDC_SKIPCOUNT,138,167,29,14,ES_AUTOHSCROLL | ES_NUMBER - CONTROL "",IDC_SPIN_MAX_SKIP_DISP_FIXED,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,156,167,12,14 + CONTROL "Fullscreen on ROM Open",IDC_FULLSCREEN_ON_OPEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,41,97,10 + CONTROL "Emulate Fullscreen",IDC_EMUFULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,52,75,10 + CONTROL "Stretch Image",IDC_STRETCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,63,60,10 + CONTROL "Maintain Aspect Ratio",IDC_ASPECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,74,85,10 + COMBOBOX IDC_ASPECTDROP,102,72,65,41,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Integer Scaling",IDC_INTEGERSCALING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,85,75,10 + CONTROL "Bilinear Filtering",IDC_BILINEAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,96,75,10 + CONTROL "Show Frame Rate",IDC_SHOWFPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,107,73,10 + CONTROL "VSync",IDC_VSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,118,37,10 + CONTROL "Reduce Input Lag",IDC_REDUCEINPUTLAG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,129,76,10 + CONTROL "Automatic, skip at most:",IDC_AUTOFRAME,"Button",BS_AUTORADIOBUTTON,12,158,122,12 + CONTROL "Fixed, always skip:",IDC_FIXEDSKIP,"Button",BS_AUTORADIOBUTTON,12,176,121,12 + EDITTEXT IDC_MAXSKIP,138,157,29,14,ES_AUTOHSCROLL | ES_NUMBER + CONTROL "",IDC_SPIN_MAX_SKIP_DISP,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,156,157,12,14 + EDITTEXT IDC_SKIPCOUNT,138,175,29,14,ES_AUTOHSCROLL | ES_NUMBER + CONTROL "",IDC_SPIN_MAX_SKIP_DISP_FIXED,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,156,175,12,14 + GROUPBOX "",IDC_SHADER_GROUP,7,196,336,72,0,WS_EX_TRANSPARENT + CONTROL "Use Shader", IDC_SHADER_ENABLED, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 12, 197, 52, 9 + LTEXT "Direct3D Shader File",IDC_STATIC,12,209,70,8 + EDITTEXT IDC_SHADER_HLSL_FILE,12,221,300,14,ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "...",IDC_SHADER_HLSL_BROWSE,318,221,18,14,WS_DISABLED + LTEXT "OpenGL/Vulkan Shader File",IDC_STATIC,12,239,68,8 + EDITTEXT IDC_SHADER_GLSL_FILE,12,251,240,14,ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "...",IDC_SHADER_GLSL_BROWSE,258,251,18,14,WS_DISABLED + PUSHBUTTON "Parameters...",IDC_SHADER_GLSL_PARAMETERS,282,251,54,14,WS_DISABLED COMBOBOX IDC_FILTERBOX,186,18,150,90,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_FILTERBOX2,222,36,114,90,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "NTSC Filter Scanlines",IDC_NTSCSCANLINES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,186,54,84,8 - LTEXT "Resolution:",IDC_CURRMODE,186,84,42,8 - COMBOBOX IDC_RESOLUTION,234,83,102,95,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Enable Triple Buffering",IDC_DBLBUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,186,98,96,8 - CONTROL "Transparency Effects",IDC_TRANS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,186,126,132,8 - CONTROL "Extend Height of SNES Image",IDC_HEIGHT_EXTEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,186,150,150,8 + LTEXT "Resolution:",IDC_CURRMODE,186,85,42,8 + COMBOBOX IDC_RESOLUTION,234,84,102,95,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Enable Triple Buffering",IDC_DBLBUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,186,101,96,8 + CONTROL "Transparency Effects",IDC_TRANS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,186,131,150,8 + CONTROL "Blend Hi-Res Images",IDC_HIRESBLEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,186,143,150,8 + CONTROL "Extend Height of SNES Image",IDC_HEIGHT_EXTEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,186,155,150,8 CONTROL "Display messages before applying filters",IDC_MESSAGES_IN_IMAGE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,186,162,150,8 - GROUPBOX "",IDC_SHADER_GROUP,6,192,336,72,0,WS_EX_TRANSPARENT - EDITTEXT IDC_SHADER_HLSL_FILE,12,216,300,14,ES_AUTOHSCROLL | WS_DISABLED - PUSHBUTTON "...",IDC_SHADER_HLSL_BROWSE,318,216,18,14,WS_DISABLED - GROUPBOX "Frame Skipping:",IDC_STATIC,6,138,167,48,0,WS_EX_TRANSPARENT - GROUPBOX "SNES Image",IDC_STATIC,180,114,162,72,0,WS_EX_TRANSPARENT - GROUPBOX "Output Image Processing",IDC_STATIC,180,6,162,60,0,WS_EX_TRANSPARENT - GROUPBOX "Fullscreen Display Settings",IDC_STATIC,180,72,162,38,0,WS_EX_TRANSPARENT - LTEXT "Hi Res:",IDC_HIRESLABEL,186,36,31,8 - GROUPBOX "General",IDC_STATIC,6,6,168,128,0,WS_EX_TRANSPARENT - LTEXT "Output Method",IDC_STATIC,12,18,51,12 - CONTROL "Use Shader",IDC_SHADER_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,192,52,9 - LTEXT "Direct3D Shader File",IDC_STATIC,12,204,70,8 - EDITTEXT IDC_SHADER_GLSL_FILE,12,246,240,14,ES_AUTOHSCROLL | WS_DISABLED - PUSHBUTTON "...",IDC_SHADER_GLSL_BROWSE,258,246,18,14,WS_DISABLED - LTEXT "OpenGL/Vulkan Shader File",IDC_STATIC,12,234,68,8 - CONTROL "Blend Hi-Res Images",IDC_HIRESBLEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,186,138,144,8 - CONTROL "VSync",IDC_VSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,107,37,10 - CONTROL "Reduce Input Lag",IDC_REDUCEINPUTLAG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,118,76,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,186,167,150,8 CONTROL "Scale messages with EPX if possible",IDC_MESSAGES_SCALE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,186,174,132,8 - PUSHBUTTON "Parameters...",IDC_SHADER_GLSL_PARAMETERS,282,246,54,14,WS_DISABLED - CONTROL "Fullscreen on ROM Open",IDC_FULLSCREEN_ON_OPEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,70,30,97,10,WS_EX_RIGHT + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,186,179,150,8 + GROUPBOX "Frame Skipping:",IDC_STATIC,6,145,167,48,0,WS_EX_TRANSPARENT + GROUPBOX "SNES Image",IDC_STATIC,180,118,162,75,0,WS_EX_TRANSPARENT + GROUPBOX "Output Image Processing",IDC_STATIC,180,6,162,61,0,WS_EX_TRANSPARENT + GROUPBOX "Fullscreen Display Settings",IDC_STATIC,180,73,162,42,0,WS_EX_TRANSPARENT + LTEXT "Hi Res:",IDC_HIRESLABEL,186,36,31,8 + GROUPBOX "General",IDC_STATIC,6,6,168,138,0,WS_EX_TRANSPARENT + LTEXT "Output Method",IDC_STATIC,12,18,51,12 END IDD_CHEATER DIALOGEX 0, 0, 378, 189 @@ -670,9 +670,9 @@ BEGIN IDD_NEWDISPLAY, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 338 + RIGHTMARGIN, 339 TOPMARGIN, 7 - BOTTOMMARGIN, 282 + BOTTOMMARGIN, 289 END IDD_CHEATER, DIALOG