tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-27 07:44:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix toolbar icons switching in dark mode makes incoherence in Preferences dialog

Browse Source 
ref:
https://github.com/notepad-plus-plus/notepad-plus-plus/issues/9742#issuecomment-836757562
This commit is contained in:
Don HO 2021-05-11 03:44:48 +02:00
parent 2d4640ce42
commit c230ccf1bd
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
View File

@ -214,6 +214,20 @@ INT_PTR CALLBACK PreferenceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
return TRUE; return TRUE;
} }
case PREF_MSG_ISCHECKED_GENERALPAGE:
{
if (!lParam)
return FALSE;
bool isChecked = _generalSubDlg.isCheckedOrNot(wParam);
*((bool*)lParam) = isChecked;
return TRUE;
}
case PREF_MSG_SETTOOLICONSFROMSTDTOSMALL:
_generalSubDlg.setToolIconsFromStdToSmall();
return TRUE;
case WM_COMMAND : case WM_COMMAND :
{ {
if (LOWORD(wParam) == IDC_LIST_DLGTITLE) if (LOWORD(wParam) == IDC_LIST_DLGTITLE)
@ -359,6 +373,13 @@ void PreferenceDlg::destroy()
_delimiterSubDlg.destroy(); _delimiterSubDlg.destroy();
} }
void GeneralSubDlg::setToolIconsFromStdToSmall()
{
::SendDlgItemMessage(_hSelf, IDC_RADIO_STANDARD, BM_SETCHECK, BST_UNCHECKED, 0);
::SendDlgItemMessage(_hSelf, IDC_RADIO_SMALLICON, BM_SETCHECK, BST_CHECKED, 0);
::SendMessage(_hParent, WM_COMMAND, IDM_VIEW_TOOLBAR_REDUCE, 0);
}
INT_PTR CALLBACK GeneralSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM) INT_PTR CALLBACK GeneralSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM)
{ {
NppParameters& nppParam = NppParameters::getInstance(); NppParameters& nppParam = NppParameters::getInstance();
@ -806,6 +827,15 @@ INT_PTR CALLBACK DarkModeSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
{ {
case IDC_CHECK_DARKMODE_ENABLE: case IDC_CHECK_DARKMODE_ENABLE:
nppGUI._darkmode.enable = isCheckedOrNot(static_cast<int>(wParam)); nppGUI._darkmode.enable = isCheckedOrNot(static_cast<int>(wParam));
// if dark mode enabled & TB_STANDARD is selected, switch to TB_SMALL
if (nppGUI._darkmode.enable)
{
bool isStandardChecked = false;
::SendMessage(_hParent, PREF_MSG_ISCHECKED_GENERALPAGE, IDC_RADIO_STANDARD, LPARAM(&isStandardChecked));
if (isStandardChecked)
::SendMessage(_hParent, PREF_MSG_SETTOOLICONSFROMSTDTOSMALL, 0, 0);
}
changed = true; changed = true;
break; break;
case IDC_CHECK_DARKMODE_ENABLE_EXPERIMENTAL: case IDC_CHECK_DARKMODE_ENABLE_EXPERIMENTAL:

2
PowerEditor/src/WinControls/Preference/preferenceDlg.h
View File

@ -37,6 +37,8 @@ class GeneralSubDlg : public StaticDialog
{ {
public : public :
GeneralSubDlg() = default; GeneralSubDlg() = default;
void setToolIconsFromStdToSmall();
private : private :
INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam);
}; };

4
PowerEditor/src/WinControls/Preference/preference_rc.h
View File

@ -17,11 +17,13 @@
#ifndef PREFERENCE_RC_H #ifndef PREFERENCE_RC_H
#define PREFERENCE_RC_H #define PREFERENCE_RC_H
#define PREF_MSG_ISCHECKED_GENERALPAGE (WM_USER + 1) // wParam:checkbox/radiobutton ID in General page. lParam is type of "bool *" to get result
#define PREF_MSG_SETTOOLICONSFROMSTDTOSMALL (WM_USER + 2)
#define IDD_PREFERENCE_BOX 6000 #define IDD_PREFERENCE_BOX 6000
#define IDC_BUTTON_CLOSE (IDD_PREFERENCE_BOX + 1) #define IDC_BUTTON_CLOSE (IDD_PREFERENCE_BOX + 1)
#define IDC_LIST_DLGTITLE (IDD_PREFERENCE_BOX + 2) #define IDC_LIST_DLGTITLE (IDD_PREFERENCE_BOX + 2)
#define IDD_PREFERENCE_SUB_GENRAL 6100 //(IDD_PREFERENCE_BOX + 100) #define IDD_PREFERENCE_SUB_GENRAL 6100 //(IDD_PREFERENCE_BOX + 100)
#define IDC_TOOLBAR_GB_STATIC (IDD_PREFERENCE_SUB_GENRAL + 1) #define IDC_TOOLBAR_GB_STATIC (IDD_PREFERENCE_SUB_GENRAL + 1)
#define IDC_CHECK_HIDE (IDD_PREFERENCE_SUB_GENRAL + 2) #define IDC_CHECK_HIDE (IDD_PREFERENCE_SUB_GENRAL + 2)