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 wrong toolbar color picker custom color between black/light mode

Browse Source 
Ref: https://github.com/notepad-plus-plus/notepad-plus-plus/pull/16370#issuecomment-2813190727
This commit is contained in:
Don Ho 2025-04-17 22:33:09 +02:00
parent b68f25f3d6
commit 1657dbbc53
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -597,18 +597,18 @@ void ToolbarSubDlg::move2CtrlLeft(int ctrlID, HWND handle2Move, int handle2MoveW
::MoveWindow(handle2Move, p.x, p.y, handle2MoveWidth, handle2MoveHeight, TRUE); ::MoveWindow(handle2Move, p.x, p.y, handle2MoveWidth, handle2MoveHeight, TRUE);
} }
void ToolbarSubDlg::enableIconColorPicker(bool enable) void ToolbarSubDlg::enableIconColorPicker(bool enable, bool useDark)
{ {
::EnableWindow(_pIconColorPicker->getHSelf(), enable); ::EnableWindow(_pIconColorPicker->getHSelf(), enable);
if (enable) if (enable)
{ {
const auto& tbIconInfo = NppDarkMode::getToolbarIconInfo(NppDarkMode::isEnabled()); const auto& tbIconInfo = NppDarkMode::getToolbarIconInfo(useDark);
_pIconColorPicker->setColour(tbIconInfo._tbCustomColor); _pIconColorPicker->setColour(tbIconInfo._tbCustomColor);
} }
else else
{ {
COLORREF disabledColor = NppDarkMode::isEnabled() ? NppDarkMode::getDlgBackgroundColor() : ::GetSysColor(COLOR_3DFACE); COLORREF disabledColor = useDark ? NppDarkMode::getDlgBackgroundColor() : ::GetSysColor(COLOR_3DFACE);
_pIconColorPicker->setColour(disabledColor); _pIconColorPicker->setColour(disabledColor);
} }
@ -855,7 +855,7 @@ intptr_t CALLBACK ToolbarSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
{ {
if (ID2Check != IDC_RADIO_CUSTOMCOLOR) if (ID2Check != IDC_RADIO_CUSTOMCOLOR)
{ {
enableIconColorPicker(false); enableIconColorPicker(false, NppDarkMode::isEnabled());
} }
} }
@ -881,7 +881,8 @@ intptr_t CALLBACK ToolbarSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
::EnableWindow(::GetDlgItem(_hSelf, IDC_RADIO_ACCENTCOLOR), enableColor); ::EnableWindow(::GetDlgItem(_hSelf, IDC_RADIO_ACCENTCOLOR), enableColor);
::EnableWindow(::GetDlgItem(_hSelf, IDC_RADIO_CUSTOMCOLOR), enableColor); ::EnableWindow(::GetDlgItem(_hSelf, IDC_RADIO_CUSTOMCOLOR), enableColor);
enableIconColorPicker(enableColor && enableCustom); bool useDark = static_cast<bool>(wParam) ? !NppDarkMode::isEnabled() : NppDarkMode::isEnabled();
enableIconColorPicker(enableColor && enableCustom, useDark);
if (NppDarkMode::isEnabled()) if (NppDarkMode::isEnabled())
@ -981,7 +982,7 @@ intptr_t CALLBACK ToolbarSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
nppGUI._tbIconInfo._tbColor = c; nppGUI._tbIconInfo._tbColor = c;
UINT msg = getToolbarIconSetMsg(nullptr); UINT msg = getToolbarIconSetMsg(nullptr);
::SendMessage(::GetParent(_hParent), msg, TRUE, 0); ::SendMessage(::GetParent(_hParent), msg, TRUE, 0);
enableIconColorPicker(true); enableIconColorPicker(true, NppDarkMode::isEnabled());
return TRUE; return TRUE;
} }
@ -992,7 +993,7 @@ intptr_t CALLBACK ToolbarSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
nppGUI._tbIconInfo._tbColor = c; nppGUI._tbIconInfo._tbColor = c;
UINT msg = getToolbarIconSetMsg(nullptr); UINT msg = getToolbarIconSetMsg(nullptr);
::SendMessage(::GetParent(_hParent), msg, TRUE, 0); ::SendMessage(::GetParent(_hParent), msg, TRUE, 0);
enableIconColorPicker(false); enableIconColorPicker(false, NppDarkMode::isEnabled());
return TRUE; return TRUE;
} }
@ -1003,7 +1004,7 @@ intptr_t CALLBACK ToolbarSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
nppGUI._tbIconInfo._tbColor = c; nppGUI._tbIconInfo._tbColor = c;
UINT msg = getToolbarIconSetMsg(nullptr); UINT msg = getToolbarIconSetMsg(nullptr);
::SendMessage(::GetParent(_hParent), msg, TRUE, 0); ::SendMessage(::GetParent(_hParent), msg, TRUE, 0);
enableIconColorPicker(false); enableIconColorPicker(false, NppDarkMode::isEnabled());
return TRUE; return TRUE;
} }
@ -1014,7 +1015,7 @@ intptr_t CALLBACK ToolbarSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
nppGUI._tbIconInfo._tbColor = c; nppGUI._tbIconInfo._tbColor = c;
UINT msg = getToolbarIconSetMsg(nullptr); UINT msg = getToolbarIconSetMsg(nullptr);
::SendMessage(::GetParent(_hParent), msg, TRUE, 0); ::SendMessage(::GetParent(_hParent), msg, TRUE, 0);
enableIconColorPicker(false); enableIconColorPicker(false, NppDarkMode::isEnabled());
return TRUE; return TRUE;
} }
@ -1025,7 +1026,7 @@ intptr_t CALLBACK ToolbarSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
nppGUI._tbIconInfo._tbColor = c; nppGUI._tbIconInfo._tbColor = c;
UINT msg = getToolbarIconSetMsg(nullptr); UINT msg = getToolbarIconSetMsg(nullptr);
::SendMessage(::GetParent(_hParent), msg, TRUE, 0); ::SendMessage(::GetParent(_hParent), msg, TRUE, 0);
enableIconColorPicker(false); enableIconColorPicker(false, NppDarkMode::isEnabled());
return TRUE; return TRUE;
} }
@ -1036,7 +1037,7 @@ intptr_t CALLBACK ToolbarSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
nppGUI._tbIconInfo._tbColor = c; nppGUI._tbIconInfo._tbColor = c;
UINT msg = getToolbarIconSetMsg(nullptr); UINT msg = getToolbarIconSetMsg(nullptr);
::SendMessage(::GetParent(_hParent), msg, TRUE, 0); ::SendMessage(::GetParent(_hParent), msg, TRUE, 0);
enableIconColorPicker(false); enableIconColorPicker(false, NppDarkMode::isEnabled());
return TRUE; return TRUE;
} }
@ -1047,7 +1048,7 @@ intptr_t CALLBACK ToolbarSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
nppGUI._tbIconInfo._tbColor = c; nppGUI._tbIconInfo._tbColor = c;
UINT msg = getToolbarIconSetMsg(nullptr); UINT msg = getToolbarIconSetMsg(nullptr);
::SendMessage(::GetParent(_hParent), msg, TRUE, 0); ::SendMessage(::GetParent(_hParent), msg, TRUE, 0);
enableIconColorPicker(false); enableIconColorPicker(false, NppDarkMode::isEnabled());
return TRUE; return TRUE;
} }
@ -1058,7 +1059,7 @@ intptr_t CALLBACK ToolbarSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
nppGUI._tbIconInfo._tbColor = c; nppGUI._tbIconInfo._tbColor = c;
UINT msg = getToolbarIconSetMsg(nullptr); UINT msg = getToolbarIconSetMsg(nullptr);
::SendMessage(::GetParent(_hParent), msg, TRUE, 0); ::SendMessage(::GetParent(_hParent), msg, TRUE, 0);
enableIconColorPicker(false); enableIconColorPicker(false, NppDarkMode::isEnabled());
return TRUE; return TRUE;
} }
@ -1069,7 +1070,7 @@ intptr_t CALLBACK ToolbarSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
nppGUI._tbIconInfo._tbColor = c; nppGUI._tbIconInfo._tbColor = c;
UINT msg = getToolbarIconSetMsg(nullptr); UINT msg = getToolbarIconSetMsg(nullptr);
::SendMessage(::GetParent(_hParent), msg, TRUE, 0); ::SendMessage(::GetParent(_hParent), msg, TRUE, 0);
enableIconColorPicker(false); enableIconColorPicker(false, NppDarkMode::isEnabled());
return TRUE; return TRUE;
} }
@ -1080,7 +1081,7 @@ intptr_t CALLBACK ToolbarSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
nppGUI._tbIconInfo._tbColor = c; nppGUI._tbIconInfo._tbColor = c;
UINT msg = getToolbarIconSetMsg(nullptr); UINT msg = getToolbarIconSetMsg(nullptr);
::SendMessage(::GetParent(_hParent), msg, TRUE, 0); ::SendMessage(::GetParent(_hParent), msg, TRUE, 0);
enableIconColorPicker(false); enableIconColorPicker(false, NppDarkMode::isEnabled());
return TRUE; return TRUE;
} }

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

@ -59,7 +59,7 @@ private:
intptr_t CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) override; intptr_t CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) override;
UINT getToolbarIconSetMsg(int* idxIconSet); UINT getToolbarIconSetMsg(int* idxIconSet);
void move2CtrlLeft(int ctrlID, HWND handle2Move, int handle2MoveWidth, int handle2MoveHeight); void move2CtrlLeft(int ctrlID, HWND handle2Move, int handle2MoveWidth, int handle2MoveHeight);
void enableIconColorPicker(bool enable); void enableIconColorPicker(bool enable, bool useDark);
ColourPicker* _pIconColorPicker = nullptr; ColourPicker* _pIconColorPicker = nullptr;
}; };