From 7c4a428e47e7d4e7bb33392504d3f838a3184fa2 Mon Sep 17 00:00:00 2001 From: ozone10 Date: Sun, 25 Jul 2021 10:52:38 +0200 Subject: [PATCH] Make dark colors consistent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Make dark colors consistent for panel toolbars. 2. Make dark colors consistent style configurator edit controls. 3. Make dark colors consistent for docking elements. * BackgroundColor(), BackgroundBrush() – should be used for items which have some interactions, or need to be different from Darker variant. * DarkerBackgroundColor(), DarkerBackgroundBrush() – should be used for static/top backgrounds. * SofterBackgroundColor(), SofterBackgroundBrush() – should be used for items , which have interactions, or have focus. Fix #10242, close #10243 --- PowerEditor/src/NppBigSwitch.cpp | 2 +- .../WinControls/ColourPicker/WordStyleDlg.cpp | 18 +++++++++++++++++- .../DockingWnd/DockingDlgInterface.h | 4 ++-- .../WinControls/DockingWnd/DockingSplitter.cpp | 6 ++---- .../WinControls/FileBrowser/fileBrowser.cpp | 2 +- .../FunctionList/functionListPanel.cpp | 2 +- .../WinControls/ProjectPanel/ProjectPanel.cpp | 2 +- 7 files changed, 25 insertions(+), 11 deletions(-) diff --git a/PowerEditor/src/NppBigSwitch.cpp b/PowerEditor/src/NppBigSwitch.cpp index 884d39ea0..d4aa1ff04 100644 --- a/PowerEditor/src/NppBigSwitch.cpp +++ b/PowerEditor/src/NppBigSwitch.cpp @@ -181,7 +181,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa { RECT rc = { 0 }; GetClientRect(hwnd, &rc); - FillRect((HDC)wParam, &rc, NppDarkMode::getBackgroundBrush()); + ::FillRect(reinterpret_cast(wParam), &rc, NppDarkMode::getDarkerBackgroundBrush()); return 0; } else diff --git a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp index 3d9cf121b..cb36e1bcb 100644 --- a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp +++ b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp @@ -191,7 +191,6 @@ INT_PTR CALLBACK WordStyleDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM l case WM_CTLCOLORLISTBOX: case WM_CTLCOLORDLG: - case WM_CTLCOLORSTATIC: { if (NppDarkMode::isEnabled()) { @@ -200,6 +199,23 @@ INT_PTR CALLBACK WordStyleDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM l break; } + case WM_CTLCOLORSTATIC: + { + if (NppDarkMode::isEnabled()) + { + HWND hwnd = reinterpret_cast(lParam); + if (hwnd == ::GetDlgItem(_hSelf, IDC_DEF_EXT_EDIT) || hwnd == ::GetDlgItem(_hSelf, IDC_DEF_KEYWORDS_EDIT)) + { + return NppDarkMode::onCtlColor(reinterpret_cast(wParam)); + } + else + { + return NppDarkMode::onCtlColorDarker(reinterpret_cast(wParam)); + } + } + break; + } + case WM_PRINTCLIENT: { if (NppDarkMode::isEnabled()) diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingDlgInterface.h b/PowerEditor/src/WinControls/DockingWnd/DockingDlgInterface.h index f2060e512..1db2c5136 100644 --- a/PowerEditor/src/WinControls/DockingWnd/DockingDlgInterface.h +++ b/PowerEditor/src/WinControls/DockingWnd/DockingDlgInterface.h @@ -104,8 +104,8 @@ protected : RECT rc = { 0 }; getClientRect(rc); - FillRect((HDC)wParam, &rc, NppDarkMode::getBackgroundBrush()); - return 1; + ::FillRect(reinterpret_cast(wParam), &rc, NppDarkMode::getDarkerBackgroundBrush()); + return TRUE; } case WM_NOTIFY: { diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp b/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp index fe7b17f31..daeee1263 100644 --- a/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp +++ b/PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp @@ -152,10 +152,8 @@ LRESULT DockingSplitter::runProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM RECT rc = { 0 }; getClientRect(rc); - - FillRect((HDC)wParam, &rc, NppDarkMode::getSofterBackgroundBrush()); - - return 1; + ::FillRect(reinterpret_cast(wParam), &rc, NppDarkMode::getBackgroundBrush()); + return TRUE; } default : break; diff --git a/PowerEditor/src/WinControls/FileBrowser/fileBrowser.cpp b/PowerEditor/src/WinControls/FileBrowser/fileBrowser.cpp index fbe2d3b23..93f873d8b 100644 --- a/PowerEditor/src/WinControls/FileBrowser/fileBrowser.cpp +++ b/PowerEditor/src/WinControls/FileBrowser/fileBrowser.cpp @@ -721,7 +721,7 @@ void FileBrowser::notified(LPNMHDR notification) if (NppDarkMode::isEnabled()) { auto nmtbcd = reinterpret_cast(notification); - FillRect(nmtbcd->nmcd.hdc, &nmtbcd->nmcd.rc, NppDarkMode::getBackgroundBrush()); + ::FillRect(nmtbcd->nmcd.hdc, &nmtbcd->nmcd.rc, NppDarkMode::getDarkerBackgroundBrush()); } } } diff --git a/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp b/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp index f8c41042c..740acceb7 100644 --- a/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp +++ b/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp @@ -618,7 +618,7 @@ void FunctionListPanel::notified(LPNMHDR notification) if (NppDarkMode::isEnabled()) { auto nmtbcd = reinterpret_cast(notification); - FillRect(nmtbcd->nmcd.hdc, &nmtbcd->nmcd.rc, NppDarkMode::getBackgroundBrush()); + ::FillRect(nmtbcd->nmcd.hdc, &nmtbcd->nmcd.rc, NppDarkMode::getDarkerBackgroundBrush()); } } } diff --git a/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp b/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp index 1fb927017..119a36edf 100644 --- a/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp +++ b/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp @@ -818,7 +818,7 @@ void ProjectPanel::notified(LPNMHDR notification) if (NppDarkMode::isEnabled()) { auto nmtbcd = reinterpret_cast(notification); - FillRect(nmtbcd->nmcd.hdc, &nmtbcd->nmcd.rc, NppDarkMode::getBackgroundBrush()); + ::FillRect(nmtbcd->nmcd.hdc, &nmtbcd->nmcd.rc, NppDarkMode::getDarkerBackgroundBrush()); nmtbcd->clrText = NppDarkMode::getTextColor(); nmtbcd->clrHighlightHotTrack = NppDarkMode::getHotBackgroundColor(); SetWindowLongPtr(_hSelf, DWLP_MSGRESULT, CDRF_NOTIFYITEMDRAW | TBCDRF_HILITEHOTTRACK);