CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-20 21:13:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

+ fix: allow removing of compile pre-processing switch D_NP3_WIN10_DARK_MODE

Browse Source
This commit is contained in:
RaiKoHoff 2020-09-17 17:25:41 +02:00
parent 7056b9add5
commit 53a589db39
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Config/Config.cpp
View File

@ -1039,8 +1039,6 @@ extern "C" bool CreateIniFile(LPCWSTR pszIniFilePath, DWORD* pdwFileSize_out)
//
void LoadSettings()
{
WCHAR wchBuffer[MIDSZ_BUFFER] = { L'\0' };
CFG_VERSION const _ver = StrIsEmpty(Globals.IniFile) ? CFG_VER_CURRENT : CFG_VER_NONE;
bool bDirtyFlag = false; // do we have to save the file on done
@ -1313,6 +1311,8 @@ void LoadSettings()
unsigned int iValue = 0;
WCHAR color[32] = { L'\0' };
WCHAR wchBuffer[MIDSZ_BUFFER] = { L'\0' };
Defaults2.DarkModeBkgColor = rgbDarkBkgColorRef;
StringCchPrintf(color, COUNTOF(color), L"%#08x", Defaults2.DarkModeBkgColor);
IniSectionGetString(IniSecSettings2, L"DarkModeBkgColor", color, wchBuffer, COUNTOF(wchBuffer));

2
src/DarkMode/DarkMode.cpp
View File

@ -20,9 +20,9 @@
#ifdef D_NP3_WIN10_DARK_MODE
#include "IatHook.hpp"
#include "ListViewUtil.hpp"
#endif
#include "ListViewUtil.hpp"
// ============================================================================

6
src/Helpers.h
View File

@ -199,6 +199,7 @@ inline int SetModeBkColor(const HDC hdc, const bool bDarkMode) {
#ifdef D_NP3_WIN10_DARK_MODE
return SetBkColor(hdc, bDarkMode ? Settings2.DarkModeBkgColor : GetSysColor(COLOR_WINDOW));
#else
UNUSED(bDarkMode);
return SetBkColor(hdc, GetSysColor(COLOR_WINDOW));
#endif
}
@ -207,6 +208,7 @@ inline int SetModeBtnFaceColor(const HDC hdc, const bool bDarkMode) {
#ifdef D_NP3_WIN10_DARK_MODE
return SetBkColor(hdc, bDarkMode ? Settings2.DarkModeBtnFaceColor : GetSysColor(COLOR_BTNFACE));
#else
UNUSED(bDarkMode);
return SetBkColor(hdc, GetSysColor(COLOR_BTNFACE));
#endif
}
@ -215,6 +217,7 @@ inline COLORREF GetModeBkColor(const bool bDarkMode) {
#ifdef D_NP3_WIN10_DARK_MODE
return bDarkMode ? Settings2.DarkModeBkgColor : (COLORREF)GetSysColor(COLOR_WINDOW);
#else
UNUSED(bDarkMode);
return (COLORREF)GetSysColor(COLOR_WINDOW);
#endif
}
@ -224,6 +227,7 @@ inline COLORREF GetModeBtnfaceColor(const bool bDarkMode) {
return bDarkMode ? Settings2.DarkModeBtnFaceColor : (COLORREF)(
IsWindows10OrGreater() ? GetSysColor(COLOR_WINDOW) : GetSysColor(COLOR_BTNFACE)); // (!) Win10 case
#else
UNUSED(bDarkMode);
return (COLORREF)GetSysColor(COLOR_BTNFACE);
#endif
}
@ -233,6 +237,7 @@ inline int SetModeTextColor(const HDC hdc, const bool bDarkMode) {
#ifdef D_NP3_WIN10_DARK_MODE
return SetTextColor(hdc, bDarkMode ? Settings2.DarkModeTxtColor : GetSysColor(COLOR_BTNTEXT));
#else
UNUSED(bDarkMode);
return SetTextColor(hdc, GetSysColor(COLOR_BTNTEXT));
#endif
}
@ -242,6 +247,7 @@ inline COLORREF GetModeTextColor(const bool bDarkMode) {
return bDarkMode ? Settings2.DarkModeTxtColor : (COLORREF)(
IsWindows10OrGreater() ? GetSysColor(COLOR_WINDOWTEXT) : GetSysColor(COLOR_BTNTEXT));
#else
UNUSED(bDarkMode);
return (COLORREF)GetSysColor(COLOR_BTNTEXT);
#endif
}

8
src/Notepad3.c
View File

@ -1311,7 +1311,11 @@ bool InitApplication(const HINSTANCE hInstance)
wc.hInstance = hInstance;
wc.hIcon = Globals.hDlgIcon256;
wc.hCursor = LoadCursor(NULL, IDC_ARROW);
#ifdef D_NP3_WIN10_DARK_MODE
wc.hbrBackground = UseDarkMode() ? Globals.hbrDarkModeBkgBrush : (HBRUSH)(COLOR_WINDOW + 1);
#else
wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
#endif
wc.lpszMenuName = MAKEINTRESOURCE(IDR_MUI_MAINMENU);
wc.lpszClassName = s_wchWndClass;
@ -2965,12 +2969,12 @@ LRESULT MsgDrawItem(HWND hwnd, WPARAM wParam, LPARAM lParam)
//~PAINTSTRUCT ps;
//~BeginPaint(hWndItem, &ps); ~ not needed on WM_DRAWITEM
#ifdef D_NP3_WIN10_DARK_MODE
//~SetModeBkColor(hdc, UseDarkMode());
SetModeBtnFaceColor(hdc, UseDarkMode());
SetModeTextColor(hdc, UseDarkMode());
#ifdef D_NP3_WIN10_DARK_MODE
if (UseDarkMode()) {
// overpaint part frames
HWND const hWndItem = pDIS->hwndItem;