Avoid column style reset on startup

Author: daddel80

src/MultiReplacePanel.cpp

@@ -3034,7 +3034,7 @@ INT_PTR CALLBACK MultiReplace::run_dlgProc(UINT message, WPARAM wParam, LPARAM l
         initializeMarkerStyle();
         initializeCtrlMap();
         initializeFontStyles();
-        updateThemeAndColors();
+        applyThemePalette();
         loadSettings();
         updateTwoButtonsVisibility();
         initializeListView();
@@ -8800,6 +8800,7 @@ void MultiReplace::showStatusMessage(const std::wstring& messageText, MessageSta
     }
 }
 
+/*
 void MultiReplace::updateThemeAndColors() {
     // Check if Notepad++ is currently in dark mode
     BOOL isDarkMode = (SendMessage(nppData._nppHandle, NPPM_ISDARKMODEENABLED, 0, 0) != 0);
@@ -8832,15 +8833,55 @@ void MultiReplace::updateThemeAndColors() {
         break;
     }
 
-    // This ensures column colors are also updated on theme change
-    initializeColumnStyles();
+    // This ensures column colors are also updated on theme change.
+    if (isColumnHighlighted)
+        initializeColumnStyles();
 
     // Force the owner-drawn status control to repaint with the new colors
     InvalidateRect(GetDlgItem(_hSelf, IDC_STATUS_MESSAGE), NULL, TRUE);
 
     // draws the (?) Find Tooltip
     InvalidateRect(GetDlgItem(_hSelf, IDC_FILTER_HELP), NULL, TRUE);
 }
+*/
+
+void MultiReplace::applyThemePalette()
+{
+    // Check if Notepad++ is currently in dark mode
+    BOOL isDarkMode = (SendMessage(nppData._nppHandle, NPPM_ISDARKMODEENABLED, 0, 0) != 0);
+
+    // Assign colours from the predefined palettes in the header file
+    if (isDarkMode) {
+        COLOR_SUCCESS = DMODE_SUCCESS;
+        COLOR_ERROR = DMODE_ERROR;
+        COLOR_INFO = DMODE_INFO;
+        _filterHelpColor = DMODE_FILTER_HELP;
+    }
+    else {
+        COLOR_SUCCESS = LMODE_SUCCESS;
+        COLOR_ERROR = LMODE_ERROR;
+        COLOR_INFO = LMODE_INFO;
+        _filterHelpColor = LMODE_FILTER_HELP;
+    }
+
+    // Update the active colour based on the last message status
+    switch (_lastMessageStatus) {
+    case MessageStatus::Success: _statusMessageColor = COLOR_SUCCESS; break;
+    case MessageStatus::Error:   _statusMessageColor = COLOR_ERROR;   break;
+    default:                     _statusMessageColor = COLOR_INFO;    break;
+    }
+
+    // Repaint status control and "(?)" tooltip so they pick up the new palette
+    InvalidateRect(GetDlgItem(_hSelf, IDC_STATUS_MESSAGE), NULL, TRUE);
+    InvalidateRect(GetDlgItem(_hSelf, IDC_FILTER_HELP), NULL, TRUE);
+}
+
+void MultiReplace::refreshColumnStylesIfNeeded()
+{
+    if (isColumnHighlighted) {          // flag is managed by highlight/clear handlers
+        initializeColumnStyles();
+    }
+}
 
 std::wstring MultiReplace::getShortenedFilePath(const std::wstring& path, int maxLength, HDC hDC) {
     bool hdcProvided = true;
@@ -10475,7 +10516,10 @@ void MultiReplace::onThemeChanged()
 {
     // Update all theme-related colors (status messages and columns)
     if (instance) {
-        instance->updateThemeAndColors();
+        {
+            instance->applyThemePalette();          // status colours, tooltip repaint
+            instance->refreshColumnStylesIfNeeded(); // guarded lexer reset
+        }
     }
 }
 

src/MultiReplacePanel.h

@@ -834,7 +834,9 @@ class MultiReplace : public StaticDialog
     void updateHeaderSelection();
     void updateHeaderSortDirection();
     void showStatusMessage(const std::wstring& messageText, MessageStatus status, bool isNotFound = false);
-    void updateThemeAndColors();
+    //void updateThemeAndColors();
+    void applyThemePalette();
+    void refreshColumnStylesIfNeeded();
     std::wstring getShortenedFilePath(const std::wstring& path, int maxLength, HDC hDC = nullptr);
     void displayResultCentered(size_t posStart, size_t posEnd, bool isDownwards);
     std::wstring getSelectedText();