Enable Dark Mode support for the QuickOpenDialog

funap · funap · commit 86926195800c · 2025-06-02T00:04:12.000+09:00
diff --git a/src/Explorer/Explorer.cpp b/src/Explorer/Explorer.cpp
@@ -336,13 +336,17 @@ void UpdateThemeColor()
 
     auto nppColors = NppInterface::GetColors();
 
-    Colors colors{
-        .face = nppColors.background,
-        .text = nppColors.text,
-        .bg = NppInterface::getEditorDefaultBackgroundColor(),
-        .fg = NppInterface::getEditorDefaultForegroundColor(),
+    ThemeColors colors{
+        .body               = nppColors.darkerText,
+        .body_bg            = nppColors.pureBackground,
+        .secondary          = NppInterface::getEditorDefaultForegroundColor(),
+        .secondary_bg       = NppInterface::getEditorDefaultBackgroundColor(),
+        .border             = nppColors.edge,
+        .primary            = nppColors.text,
+        .primary_bg         = nppColors.hotBackground,
+        .primary_border     = nppColors.hotEdge,
     };
-    auto isDarkMode = IsDarkColor(colors.bg);
+    auto isDarkMode = IsDarkColor(colors.body_bg);
     ThemeRenderer::Instance().SetTheme(isDarkMode, colors);
 }
 
@@ -355,6 +359,7 @@ void initializeFonts()
         ::DeleteObject(exProp.underlineFont);
     }
     exProp.defaultFont = ::CreateFontIndirect(&exProp.logfont);
+
     LOGFONT logfontUnder = exProp.logfont;
     logfontUnder.lfUnderline = TRUE;
     exProp.underlineFont = ::CreateFontIndirect(&logfontUnder);
diff --git a/src/Explorer/FavesDialog.cpp b/src/Explorer/FavesDialog.cpp
@@ -100,7 +100,6 @@ FavesDialog::FavesDialog()
 
 FavesDialog::~FavesDialog()
 {
-    ImageList_Destroy(_hImageList);
 }
 
 
diff --git a/src/Explorer/NppInterface.cpp b/src/Explorer/NppInterface.cpp
@@ -77,7 +77,7 @@ COLORREF NppInterface::getEditorDefaultBackgroundColor()
 
 COLORREF NppInterface::getEditorCurrentLineBackgroundColor()
 {
-    return static_cast<COLORREF>(::SendMessage(_nppData._scintillaMainHandle, SCI_GETELEMENTCOLOUR, SC_ELEMENT_CARET_LINE_BACK, 0));
+    return static_cast<COLORREF>(::SendMessage(_nppData._scintillaMainHandle, SCI_GETCARETLINEBACK, 0, 0));
 }
 
 BOOL NppInterface::IsDarkMode()
@@ -111,13 +111,13 @@ NppColors NppInterface::GetColors()
     }
     // default colors;
     return {
-        .background         = ::GetSysColor(COLOR_WINDOW),
-        .softerBackground   = ::GetSysColor(COLOR_3DFACE),
-        .hotBackground      = ::GetSysColor(COLOR_HIGHLIGHT),
-        .pureBackground     = ::GetSysColor(COLOR_WINDOW),
+        .background         = ::GetSysColor(COLOR_3DFACE),
+        .softerBackground   = ::GetSysColor(COLOR_WINDOW),
+        .hotBackground      = RGB(204, 232, 255),
+        .pureBackground     = ::GetSysColor(COLOR_3DFACE),
         .errorBackground    = ::GetSysColor(COLOR_WINDOW),
         .text               = ::GetSysColor(COLOR_WINDOWTEXT),
-        .darkerText         = ::GetSysColor(COLOR_HIGHLIGHTTEXT),
+        .darkerText         = ::GetSysColor(COLOR_WINDOWTEXT),
         .disabledText       = ::GetSysColor(COLOR_GRAYTEXT),
         .linkText           = ::GetSysColor(COLOR_HOTLIGHT),
         .edge               = ::GetSysColor(COLOR_INACTIVEBORDER),
diff --git a/src/Explorer/QuickOpenDialog.cpp b/src/Explorer/QuickOpenDialog.cpp
@@ -39,6 +39,7 @@
 #include "ExplorerResource.h"
 #include "FuzzyMatcher.h"
 #include "NppInterface.h"
+#include "ThemeRenderer.h"
 
 namespace {
     constexpr UINT WM_UPDATE_RESULT_LIST = WM_USER + 1;
@@ -517,6 +518,7 @@ void QuickOpenDlg::init(HINSTANCE hInst, HWND parent, ExProp* prop)
 
     Window::init(hInst, parent);
     create(IDD_QUICK_OPEN_DLG, FALSE);
+    ThemeRenderer::Instance().Register(_hSelf);
 
     _filesystemWatcher.Created([this](const std::wstring& path) {
         if (IsFile(path)) {
@@ -645,15 +647,16 @@ BOOL QuickOpenDlg::onDrawItem(LPDRAWITEMSTRUCT drawItem)
     }
 
     const HDC& hdc = drawItem->hDC;
-    COLORREF backgroundColor        = RGB(255, 255, 255);
-    COLORREF backgroundMatchColor   = RGB(252, 234, 128);
-    COLORREF textColor1             = RGB(  0,   0,   0);
+    COLORREF backgroundMatchColor   = RGB(254, 230, 177);
+    COLORREF matchColor             = RGB(0, 0, 0);
+
+    COLORREF backgroundColor        = ThemeRenderer::Instance().GetColors().secondary_bg;
+    COLORREF textColor1             = ThemeRenderer::Instance().GetColors().secondary;
     COLORREF textColor2             = RGB(128, 128, 128);
 
     if (ODS_SELECTED == ((drawItem->itemState) & (ODS_SELECTED))) {
-        backgroundColor             = RGB(230, 231, 239);
-        backgroundMatchColor        = RGB(252, 234, 128);
-        textColor1                  = RGB(  0,   0,   0);
+        backgroundColor             = ThemeRenderer::Instance().GetColors().primary_bg;
+        textColor1                  = ThemeRenderer::Instance().GetColors().primary;
         textColor2                  = RGB(128, 128, 128);
     }
 
@@ -665,7 +668,6 @@ BOOL QuickOpenDlg::onDrawItem(LPDRAWITEMSTRUCT drawItem)
     RECT drawPosition = drawItem->rcItem;
     drawPosition.top += _layout.itemMargin;
     drawPosition.left = drawItem->rcItem.left + _layout.itemMarginLeft;
-    ::SetTextColor(hdc, textColor1);
     ::SetBkMode(hdc, OPAQUE);
 
     RECT calcRect = {};
@@ -679,10 +681,12 @@ BOOL QuickOpenDlg::onDrawItem(LPDRAWITEMSTRUCT drawItem)
     if (type == QuickOpenEntry::MATCH_TYPE::FILE) {
         for (size_t i = 0; i < filename.length(); ++i) {
             if ((itr != last) && (i == *itr)) {
+                ::SetTextColor(hdc, matchColor);
                 ::SetBkColor(hdc, backgroundMatchColor);
                 ++itr;
             }
             else {
+                ::SetTextColor(hdc, textColor1);
                 ::SetBkColor(hdc, backgroundColor);
             }
             ::DrawText(hdc, &filename[i], 1, &drawPosition, DT_SINGLELINE);
@@ -691,21 +695,24 @@ BOOL QuickOpenDlg::onDrawItem(LPDRAWITEMSTRUCT drawItem)
         }
     }
     else {
+        ::SetTextColor(hdc, textColor1);
         ::SetBkColor(hdc, backgroundColor);
         ::DrawText(hdc, filename.data(), static_cast<INT>(filename.length()), &drawPosition, DT_SINGLELINE);
         ::DrawText(hdc, filename.data(), static_cast<INT>(filename.length()), &calcRect, DT_SINGLELINE | DT_CALCRECT);
     }
 
     drawPosition.top += calcRect.bottom;
     drawPosition.left = drawItem->rcItem.left + _layout.itemMarginLeft;
-    ::SetTextColor(hdc, textColor2);
+
     if (type == QuickOpenEntry::MATCH_TYPE::PATH) {
         for (size_t i = 0; i < path.length(); ++i) {
             if ((itr != last) && (i == *itr)) {
+                ::SetTextColor(hdc, matchColor);
                 ::SetBkColor(hdc, backgroundMatchColor);
                 ++itr;
             }
             else {
+                ::SetTextColor(hdc, textColor2);
                 ::SetBkColor(hdc, backgroundColor);
             }
             ::DrawText(hdc, &path[i], 1, &drawPosition, DT_SINGLELINE);
@@ -714,6 +721,7 @@ BOOL QuickOpenDlg::onDrawItem(LPDRAWITEMSTRUCT drawItem)
         }
     }
     else {
+        ::SetTextColor(hdc, textColor2);
         ::SetBkColor(hdc, backgroundColor);
         ::DrawText(hdc, path.data(), static_cast<INT>(path.length()), &drawPosition, DT_SINGLELINE);
     }
@@ -760,26 +768,18 @@ INT_PTR CALLBACK QuickOpenDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM l
             if (!_directoryReader.IsReading()) {
                 ::KillTimer(_hSelf, UPDATE_PROGRESSBAR);
             }
-            ::InvalidateRect(_hSelf, &_progressBarRect, FALSE);
+            ::InvalidateRect(_hSelf, &_progressBarRect, TRUE);
             ::UpdateWindow(_hSelf);
             ret = TRUE;
             break;
         default:
             break;
         }
         break;
-    case WM_PRINTCLIENT:
     case WM_PAINT:
     {
-        HDC hDC = (Message == WM_PRINTCLIENT)
-            ? reinterpret_cast<HDC>(wParam)
-            : GetDCEx(_hSelf, nullptr, DCX_INTERSECTUPDATE | DCX_CACHE | DCX_CLIPCHILDREN | DCX_CLIPSIBLINGS);
-
-        // Erase progressbar background
-        const COLORREF backgroundColor = ::GetSysColor(COLOR_3DFACE);
-        const HBRUSH hBkBrush = ::CreateSolidBrush(backgroundColor);
-        ::FillRect(hDC, &_progressBarRect, hBkBrush);
-        ::DeleteObject(hBkBrush);
+        PAINTSTRUCT ps;
+        HDC hDC = ::BeginPaint(_hSelf, &ps);
 
         // draw progress bar
         if (_directoryReader.IsReading()) {
@@ -799,8 +799,8 @@ INT_PTR CALLBACK QuickOpenDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM l
             ::FillRect(hDC, &barRect, hPbBrush);
             ::DeleteObject(hPbBrush);
         }
-
-        ret = FALSE; // continue default proc
+        EndPaint(_hSelf, &ps);
+        ret = TRUE;
         break;
     }
     case WM_COMMAND :
diff --git a/src/Explorer/ThemeRenderer.cpp b/src/Explorer/ThemeRenderer.cpp
@@ -31,6 +31,7 @@ namespace {
 constexpr UINT_PTR WINDOW_SUBCLASS_ID   = 0;
 constexpr UINT_PTR REBAR_SUBCLASS_ID    = 1;
 constexpr UINT_PTR BUTTON_SUBCLASS_ID   = 2;
+constexpr UINT_PTR EDIT_SUBCLASS_ID     = 3;
 
 auto GetClassName(HWND hwnd) -> std::wstring
 {
@@ -73,18 +74,43 @@ ThemeRenderer& ThemeRenderer::Instance()
     return *s_instance;
 }
 
+HBRUSH ThemeRenderer::GetBrush(BrushType type) const
+{
+    switch (type) {
+    case BrushType::Body:
+        return m_brushes.body;
+    case BrushType::BodyBg:
+        return m_brushes.body_bg;
+    case BrushType::Secondary:
+        return m_brushes.secondary;
+    case BrushType::SecondaryBg:
+        return m_brushes.secondary_bg;
+    case BrushType::Border:
+        return m_brushes.border;
+    case BrushType::Primary:
+        return m_brushes.primary;
+    case BrushType::PrimaryBg:
+        return m_brushes.primary_bg;
+    case BrushType::PrimaryBorder:
+        return m_brushes.primary_border;
+    default:
+        return m_brushes.body_bg;  // デフォルトは本文背景を返す
+    }
+}
 
-void ThemeRenderer::SetTheme(BOOL isDarkMode, Colors colors)
+void ThemeRenderer::SetTheme(BOOL isDarkMode, const ThemeColors& colors)
 {
     m_isDarkMode = isDarkMode;
     m_colors     = colors;
 
-    m_brushes.face.CreateSolidBrush(colors.face);
-    m_brushes.bg.CreateSolidBrush(colors.bg);
-    m_brushes.hot.CreateSolidBrush(colors.hot);
-    m_brushes.hotSelected.CreateSolidBrush(colors.hotSelected);
-    m_brushes.selected.CreateSolidBrush(colors.selected);
-    m_brushes.selectedNotFocus.CreateSolidBrush(colors.selectedNotFocus);
+    m_brushes.body.CreateSolidBrush(colors.body);
+    m_brushes.body_bg.CreateSolidBrush(colors.body_bg);
+    m_brushes.secondary.CreateSolidBrush(colors.secondary);
+    m_brushes.secondary_bg.CreateSolidBrush(colors.secondary_bg);
+    m_brushes.border.CreateSolidBrush(colors.border);
+    m_brushes.primary.CreateSolidBrush(colors.primary);
+    m_brushes.primary_bg.CreateSolidBrush(colors.primary_bg);
+    m_brushes.primary_border.CreateSolidBrush(colors.primary_border);
 
     for (const auto& hwnd : m_windows) {
         ApplyTheme(hwnd);
@@ -106,6 +132,9 @@ void ThemeRenderer::Register(HWND hwnd)
         else if (className == WC_BUTTON) {
             ::SetWindowSubclass(childWindow, DefaultSubclassProc, BUTTON_SUBCLASS_ID, reinterpret_cast<DWORD_PTR>(self));
         }
+        else if (className == WC_EDIT) {
+            ::SetWindowSubclass(childWindow, DefaultSubclassProc, EDIT_SUBCLASS_ID, reinterpret_cast<DWORD_PTR>(self));
+        }
         return TRUE;
     }, reinterpret_cast<LPARAM>(this));
 
@@ -120,21 +149,21 @@ void ThemeRenderer::ApplyTheme(HWND hwnd)
         if (className == TOOLBARCLASSNAME) {
             COLORSCHEME scheme{
                 .dwSize          = sizeof(COLORSCHEME),
-                .clrBtnHighlight = self->m_colors.selected,
-                .clrBtnShadow    = self->m_colors.face,
+                .clrBtnHighlight = self->m_colors.primary_bg,
+                .clrBtnShadow    = self->m_colors.secondary_bg,
             };
             ::SendMessage(childWindow, TB_SETCOLORSCHEME, 0, reinterpret_cast<LPARAM>(&scheme));
         }
         else if (className == WC_TREEVIEW) {
-            TreeView_SetBkColor(childWindow, self->m_colors.bg);
-            TreeView_SetTextColor(childWindow, self->m_colors.fg);
+            TreeView_SetBkColor(childWindow, self->m_colors.secondary_bg);
+            TreeView_SetTextColor(childWindow, self->m_colors.secondary);
             ::SetWindowTheme(childWindow, self->m_isDarkMode ? L"DarkMode_Explorer" : L"Explorer", nullptr);
         }
         else if (className == WC_LISTVIEW) {
-            ListView_SetBkColor(childWindow, self->m_colors.bg);
-            ListView_SetTextColor(childWindow, self->m_colors.fg);
+            ListView_SetBkColor(childWindow, self->m_colors.secondary_bg);
+            ListView_SetTextColor(childWindow, self->m_colors.secondary);
             ListView_SetTextBkColor(childWindow, CLR_NONE);
-            ::InvalidateRect(childWindow, NULL, TRUE);
+            ::SetWindowTheme(childWindow, self->m_isDarkMode ? L"DarkMode_Explorer" : L"Explorer", nullptr);
         }
         return TRUE;
     }, reinterpret_cast<LPARAM>(this));
@@ -150,6 +179,8 @@ LRESULT CALLBACK ThemeRenderer::DefaultSubclassProc(HWND hWnd, UINT uMsg, WPARAM
         return self->RebarProc(hWnd, uMsg, wParam, lParam);
     case BUTTON_SUBCLASS_ID:
         return self->ButtonProc(hWnd, uMsg, wParam, lParam);
+    case EDIT_SUBCLASS_ID:
+        return self->EditProc(hWnd, uMsg, wParam, lParam);
     default:
         break;
     }
@@ -162,9 +193,16 @@ LRESULT ThemeRenderer::WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP
     case WM_ERASEBKGND: {
         RECT rc{};
         ::GetClientRect(hWnd, &rc);
-        ::FillRect((HDC)wParam, &rc, m_brushes.face);
+        ::FillRect((HDC)wParam, &rc, m_brushes.body_bg);
         return TRUE;
     }
+    case WM_CTLCOLOREDIT:
+    {
+        HDC hdc = (HDC)wParam;
+        ::SetTextColor(hdc, m_colors.secondary);
+        ::SetBkColor(hdc, m_colors.secondary_bg);
+        return (LRESULT)(HBRUSH)m_brushes.secondary_bg;
+    }
     case WM_NCDESTROY:
         ::RemoveWindowSubclass(hWnd, DefaultSubclassProc, REBAR_SUBCLASS_ID);
         m_windows.erase(hWnd);
@@ -179,7 +217,7 @@ LRESULT ThemeRenderer::RebarProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPa
     case WM_ERASEBKGND: {
         RECT rc{};
         ::GetClientRect(hWnd, &rc);
-        ::FillRect((HDC)wParam, &rc, m_brushes.face);
+        ::FillRect((HDC)wParam, &rc, m_brushes.secondary_bg);
         return TRUE;
     }
     case WM_NCDESTROY:
@@ -196,7 +234,7 @@ LRESULT ThemeRenderer::ButtonProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP
     case WM_ERASEBKGND: {
         RECT rc{};
         ::GetClientRect(hWnd, &rc);
-        ::FillRect((HDC)wParam, &rc, m_brushes.face);
+        ::FillRect((HDC)wParam, &rc, m_brushes.body_bg);
         return TRUE;
     }
     case WM_NCDESTROY:
@@ -206,3 +244,30 @@ LRESULT ThemeRenderer::ButtonProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP
     }
     return ::DefSubclassProc(hWnd, uMsg, wParam, lParam);
 }
+
+LRESULT ThemeRenderer::EditProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    switch (uMsg) {
+    case WM_NCPAINT: {
+        HDC hdc = GetWindowDC(hWnd);
+        RECT rect;
+        GetWindowRect(hWnd, &rect);
+        OffsetRect(&rect, -rect.left, -rect.top);
+
+        HWND hFocusWnd = GetFocus();
+        if (hFocusWnd == hWnd) {
+            FrameRect(hdc, &rect, m_brushes.primary_border);
+        } else {
+            FrameRect(hdc, &rect, m_brushes.border);
+        }
+
+        ReleaseDC(hWnd, hdc);
+        return TRUE;
+    }
+    case WM_NCDESTROY:
+        ::RemoveWindowSubclass(hWnd, DefaultSubclassProc, EDIT_SUBCLASS_ID);
+        m_windows.erase(hWnd);
+        break;
+    }
+    return ::DefSubclassProc(hWnd, uMsg, wParam, lParam);
+}
diff --git a/src/Explorer/ThemeRenderer.h b/src/Explorer/ThemeRenderer.h

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,6 @@ FavesDialog::FavesDialog()`
`100`	`100`
`101`	`101`	`FavesDialog::~FavesDialog()`
`102`	`102`	`{`
`103`		`- ImageList_Destroy(_hImageList);`
`104`	`103`	`}`
`105`	`104`
`106`	`105`