diff options
| author | George Hazan <george.hazan@gmail.com> | 2024-05-08 14:08:24 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2024-05-08 14:08:28 +0300 |
| commit | 887c741419450a7bf29010e799fd226294545c3d (patch) | |
| tree | 6187c41ea602fba24c0c596858d03840395b5edf /src/core/stdpopup | |
| parent | d7caf2a381dc06a4294d93e0f0fc5d962991e59a (diff) | |
fixes #4213 completely
Diffstat (limited to 'src/core/stdpopup')
| -rw-r--r-- | src/core/stdpopup/res/resource.rc | 7 | ||||
| -rw-r--r-- | src/core/stdpopup/src/options.cpp | 13 | ||||
| -rw-r--r-- | src/core/stdpopup/src/resource.h | 1 |
3 files changed, 4 insertions, 17 deletions
diff --git a/src/core/stdpopup/res/resource.rc b/src/core/stdpopup/res/resource.rc index 4ead0c34aa..30f2a9d594 100644 --- a/src/core/stdpopup/res/resource.rc +++ b/src/core/stdpopup/res/resource.rc @@ -113,10 +113,9 @@ EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Disable when",IDC_STATIC,6,7,283,203 - CONTROL "",IDC_LST_STATUS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOLABELWRAP | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,61,275,142 - CONTROL "Always (has priority)",IDC_DISABLE_ALWAYS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,19,270,10 - CONTROL "Fullscreen mode",IDC_DISABLE_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,33,270,10 - LTEXT "Statuses",IDC_STATIC,11,49,269,8 + CONTROL "",IDC_LST_STATUS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOLABELWRAP | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,48,275,155 + CONTROL "Fullscreen mode",IDC_DISABLE_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,20,269,10 + LTEXT "Statuses",IDC_STATIC,11,36,269,8 END IDD_CLASSES DIALOGEX 0, 0, 294, 223 diff --git a/src/core/stdpopup/src/options.cpp b/src/core/stdpopup/src/options.cpp index 73d7ea1baf..5279413107 100644 --- a/src/core/stdpopup/src/options.cpp +++ b/src/core/stdpopup/src/options.cpp @@ -317,22 +317,19 @@ public: class CAdvancedOptDlg : public CBaseOptionsDlg { - CCtrlCheck chkAlways, chkFullScreen; + CCtrlCheck chkFullScreen; CCtrlListView m_statuses; public: CAdvancedOptDlg() : CBaseOptionsDlg(IDD_OPT_ADVANCED), m_statuses(this, IDC_LST_STATUS), - chkAlways(this, IDC_DISABLE_ALWAYS), chkFullScreen(this, IDC_DISABLE_FULLSCREEN) { - chkAlways.OnChange = Callback(this, &CAdvancedOptDlg::onChange_Always); } bool OnInitDialog() override { - chkAlways.SetState(!Popup_Enabled()); chkFullScreen.SetState(options.disable_full_screen); // initialise and fill listbox @@ -370,20 +367,12 @@ public: bool OnApply() override { - Popup_Enable(!chkAlways.IsChecked()); options.disable_full_screen = chkFullScreen.IsChecked(); for (int i = 0; i < _countof(options.disable_status); i++) options.disable_status[i] = (m_statuses.GetCheckState(i) == 1); return true; } - - void onChange_Always(CCtrlCheck *) - { - bool bEnable = !chkAlways.IsChecked(); - m_statuses.Enable(bEnable); - chkFullScreen.Enable(bEnable); - } }; ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/stdpopup/src/resource.h b/src/core/stdpopup/src/resource.h index 3755fe6412..c4a4b33c67 100644 --- a/src/core/stdpopup/src/resource.h +++ b/src/core/stdpopup/src/resource.h @@ -56,7 +56,6 @@ #define IDC_HISTORY_FILTER_CASESENSITIVE 1046 #define IDC_LST_CLASSES 1047 #define IDC_CHK_TIMEOUT 1048 -#define IDC_DISABLE_ALWAYS 1051 #define IDC_DISABLE_FULLSCREEN 1052 // Next default values for new objects |