From c0a47c2c796796c512737f2fcc6e5ebf2e703e93 Mon Sep 17 00:00:00 2001 From: lightningterror Date: Sun, 17 Feb 2019 20:17:41 +0100 Subject: [PATCH] Lilypad: Don't toggle width and heigh for Inputs window with Show/hide Special Inputs button. Use a fixed size instead. It will avoid DPI scaling issues. Also adjust the Special Inputs buttons height position so that the window height remains a reasonable size. --- plugins/LilyPad/Config.cpp | 8 ++--- plugins/LilyPad/LilyPad.rc | 60 +++++++++++++++++++------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/plugins/LilyPad/Config.cpp b/plugins/LilyPad/Config.cpp index 6353571481..e69be4f284 100644 --- a/plugins/LilyPad/Config.cpp +++ b/plugins/LilyPad/Config.cpp @@ -1986,11 +1986,11 @@ INT_PTR CALLBACK DialogProc(HWND hWnd, unsigned int msg, WPARAM wParam, LPARAM l } else if (cmd == IDC_CONFIGURE_ON_BIND) { config.configureOnBind = IsDlgButtonChecked(hWnd, IDC_CONFIGURE_ON_BIND); } else if (cmd == ID_SPECIAL_INPUTS) { - // FIXME: Fix DPI Scaling. config.specialInputs[port][slot] = !config.specialInputs[port][slot]; - SetWindowPos(hWndList, NULL, 0, 0, 275, config.specialInputs[port][slot] ? 324 : 440, SWP_NOZORDER | SWP_NOMOVE); - ListView_SetColumnWidth(hWndList, 2, LVSCW_AUTOSIZE_USEHEADER); - UnselectAll(hWndList); + // FIXME: Fix DPI Scaling. Below code is commented out and a fixed size for inputs window is used to avoid DPI scaling issues. + // SetWindowPos(hWndList, NULL, 0, 0, 275, config.specialInputs[port][slot] ? 324 : 440, SWP_NOZORDER | SWP_NOMOVE); + // ListView_SetColumnWidth(hWndList, 2, LVSCW_AUTOSIZE_USEHEADER); + // UnselectAll(hWndList); SelChanged(port, slot); } if (cmd == IDC_RAPID_FIRE) { diff --git a/plugins/LilyPad/LilyPad.rc b/plugins/LilyPad/LilyPad.rc index 85094b1ba7..36faab8657 100644 --- a/plugins/LilyPad/LilyPad.rc +++ b/plugins/LilyPad/LilyPad.rc @@ -54,7 +54,7 @@ IDD_CONFIG DIALOGEX 0, 0, 424, 283 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,271,WS_EX_CLIENTEDGE + CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,237,WS_EX_CLIENTEDGE // Input Bindings: PUSHBUTTON "Select",ID_SELECT,328,34,34,15 PUSHBUTTON "Start",ID_START,366,34,34,15 @@ -99,11 +99,11 @@ BEGIN PUSHBUTTON "Show Special Inputs",ID_SPECIAL_INPUTS,196,249,90,15 COMBOBOX IDC_DEVICE_SELECT,304,250,113,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP // Special bindings: - PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,210,58,15 - PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,210,58,15 - PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,210,58,15 - PUSHBUTTON "Turbo",ID_TURBO_KEY,7,228,58,15 - PUSHBUTTON "Exclude Input",ID_EXCLUDE,7,246,58,15 + PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,249,58,15 + PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,249,58,15 + PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,249,58,15 + PUSHBUTTON "Turbo",ID_TURBO_KEY,7,265,58,15 + PUSHBUTTON "Exclude Input",ID_EXCLUDE,131,265,58,15 // Force Feedback & Input configurations: PUSHBUTTON "Back to Controls",ID_CONTROLS,196,260,59,15 PUSHBUTTON "Reset Configuration",ID_RESET_CONFIG,259,260,72,15 @@ -158,7 +158,7 @@ IDD_CONFIG_POPN DIALOGEX 0, 0, 424, 283 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,271,WS_EX_CLIENTEDGE + CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,237,WS_EX_CLIENTEDGE // Input Bindings: PUSHBUTTON "Select", ID_SELECT,262,25,43,15 PUSHBUTTON "Start", ID_START,306,25,43,15 @@ -183,11 +183,11 @@ BEGIN PUSHBUTTON "Show Special Inputs",ID_SPECIAL_INPUTS,196,249,90,15 COMBOBOX IDC_DEVICE_SELECT,304,250,113,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP // Special bindings: - PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,210,58,15 - PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,210,58,15 - PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,210,58,15 - PUSHBUTTON "Turbo",ID_TURBO_KEY,7,228,58,15 - PUSHBUTTON "Exclude Input",ID_EXCLUDE,7,246,58,15 + PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,249,58,15 + PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,249,58,15 + PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,249,58,15 + PUSHBUTTON "Turbo",ID_TURBO_KEY,7,265,58,15 + PUSHBUTTON "Exclude Input",ID_EXCLUDE,131,265,58,15 // Force Feedback & Input configurations: PUSHBUTTON "Back to Controls",ID_CONTROLS,196,260,59,15 PUSHBUTTON "Reset Configuration",ID_RESET_CONFIG,259,260,72,15 @@ -242,7 +242,7 @@ IDD_CONFIG_GUITAR DIALOGEX 0, 0, 424, 283 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,271,WS_EX_CLIENTEDGE + CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,237,WS_EX_CLIENTEDGE // Input Bindings: PUSHBUTTON "Fret 1",ID_R2,283,30,45,15 PUSHBUTTON "Fret 2",ID_CIRCLE,283,53,45,15 @@ -267,11 +267,11 @@ BEGIN PUSHBUTTON "Show Special Inputs",ID_SPECIAL_INPUTS,196,249,90,15 COMBOBOX IDC_DEVICE_SELECT,304,250,113,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP // Special bindings: - PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,210,58,15 - PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,210,58,15 - PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,210,58,15 - PUSHBUTTON "Turbo",ID_TURBO_KEY,7,228,58,15 - PUSHBUTTON "Exclude Input",ID_EXCLUDE,7,246,58,15 + PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,249,58,15 + PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,249,58,15 + PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,249,58,15 + PUSHBUTTON "Turbo",ID_TURBO_KEY,7,265,58,15 + PUSHBUTTON "Exclude Input",ID_EXCLUDE,131,265,58,15 // Force Feedback & Input configurations: PUSHBUTTON "Back to Controls",ID_CONTROLS,196,260,59,15 PUSHBUTTON "Reset Configuration",ID_RESET_CONFIG,259,260,72,15 @@ -326,7 +326,7 @@ IDD_CONFIG_PS1_MOUSE DIALOGEX 0, 0, 424, 283 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,271,WS_EX_CLIENTEDGE + CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,237,WS_EX_CLIENTEDGE // Input bindings: PUSHBUTTON "Mouse",ID_MOUSE,379,28,34,15 GROUPBOX "Mouse buttons",IDC_FACE,242,46,124,34 @@ -349,11 +349,11 @@ BEGIN PUSHBUTTON "Show Special Inputs",ID_SPECIAL_INPUTS,196,249,90,15 COMBOBOX IDC_DEVICE_SELECT,304,250,113,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP // Special bindings: - PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,210,58,15 - PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,210,58,15 - PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,210,58,15 - PUSHBUTTON "Turbo",ID_TURBO_KEY,7,228,58,15 - PUSHBUTTON "Exclude Input",ID_EXCLUDE,7,246,58,15 + PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,249,58,15 + PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,249,58,15 + PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,249,58,15 + PUSHBUTTON "Turbo",ID_TURBO_KEY,7,265,58,15 + PUSHBUTTON "Exclude Input",ID_EXCLUDE,131,265,58,15 // Force Feedback & Input configurations: PUSHBUTTON "Back to Controls",ID_CONTROLS,196,260,59,15 PUSHBUTTON "Reset Configuration",ID_RESET_CONFIG,259,260,72,15 @@ -380,7 +380,7 @@ IDD_CONFIG_NEGCON DIALOGEX 0, 0, 424, 283 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,271,WS_EX_CLIENTEDGE + CONTROL "",IDC_BINDINGS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,183,237,WS_EX_CLIENTEDGE // Input bindings: GROUPBOX "Shoulder buttons",IDC_SHOULDER,220,30,173,34 PUSHBUTTON "Analog L",ID_L1,233,41,34,15 @@ -413,11 +413,11 @@ BEGIN PUSHBUTTON "Show Special Inputs",ID_SPECIAL_INPUTS,196,249,90,15 COMBOBOX IDC_DEVICE_SELECT,304,250,113,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP // Special bindings: - PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,210,58,15 - PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,210,58,15 - PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,210,58,15 - PUSHBUTTON "Turbo",ID_TURBO_KEY,7,228,58,15 - PUSHBUTTON "Exclude Input",ID_EXCLUDE,7,246,58,15 + PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,7,249,58,15 + PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,69,249,58,15 + PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,131,249,58,15 + PUSHBUTTON "Turbo",ID_TURBO_KEY,7,265,58,15 + PUSHBUTTON "Exclude Input",ID_EXCLUDE,131,265,58,15 // Force Feedback & Input configurations: PUSHBUTTON "Back to Controls",ID_CONTROLS,196,260,59,15 PUSHBUTTON "Reset Configuration",ID_RESET_CONFIG,259,260,72,15