remember invert colors setting in advanced settings

Author: kjk

do/settings_def.go

@@ -80,7 +80,7 @@ var (
 				"background might allow to subconsciously determine reading progress; "+
 				"suggested values: #2828aa #28aa28 #aa2828"),
 		mkField("InvertColors", Bool, false,
-			"if true, TextColor and BackgroundColor will be temporarily swapped").setInternal(),
+			"if true, TextColor and BackgroundColor of the document will be swapped"),
 		mkField("HideScrollbars", Bool, false,
 			"if true, hides the scrollbars but retains ability to scroll"),
 	}

src/AppSettings.cpp

@@ -308,16 +308,13 @@ bool ReloadSettings() {
 
     const char* uiLanguage = str::DupTemp(gGlobalPrefs->uiLanguage);
     bool showToolbar = gGlobalPrefs->showToolbar;
-    bool invertColors = gGlobalPrefs->fixedPageUI.invertColors;
 
     gFileHistory.UpdateStatesSource(nullptr);
     CleanUpSettings();
 
     ok = LoadSettings();
     CrashAlwaysIf(!ok || !gGlobalPrefs);
 
-    gGlobalPrefs->fixedPageUI.invertColors = invertColors;
-
     // TODO: about window doesn't have to be at position 0
     if (gWindows.size() > 0 && gWindows.at(0)->IsAboutWindow()) {
         MainWindow* win = gWindows.at(0);

src/Settings.h

@@ -63,7 +63,8 @@ struct FixedPageUI {
     // subconsciously determine reading progress; suggested values: #2828aa
     // #28aa28 #aa2828
     Vec<char*>* gradientColors;
-    // if true, TextColor and BackgroundColor will be temporarily swapped
+    // if true, TextColor and BackgroundColor of the document will be
+    // swapped
     bool invertColors;
     // if true, hides the scrollbars but retains ability to scroll
     bool hideScrollbars;
@@ -467,11 +468,12 @@ static const FieldInfo gFixedPageUIFields[] = {
     {offsetof(FixedPageUI, windowMargin), SettingType::Compact, (intptr_t)&gWindowMarginInfo},
     {offsetof(FixedPageUI, pageSpacing), SettingType::Compact, (intptr_t)&gSizeInfo},
     {offsetof(FixedPageUI, gradientColors), SettingType::ColorArray, 0},
+    {offsetof(FixedPageUI, invertColors), SettingType::Bool, false},
     {offsetof(FixedPageUI, hideScrollbars), SettingType::Bool, false},
 };
-static const StructInfo gFixedPageUIInfo = {
-    sizeof(FixedPageUI), 7, gFixedPageUIFields,
-    "TextColor\0BackgroundColor\0SelectionColor\0WindowMargin\0PageSpacing\0GradientColors\0HideScrollbars"};
+static const StructInfo gFixedPageUIInfo = {sizeof(FixedPageUI), 8, gFixedPageUIFields,
+                                            "TextColor\0BackgroundColor\0SelectionColor\0WindowMargin\0PageSpacing\0Gra"
+                                            "dientColors\0InvertColors\0HideScrollbars"};
 
 static const FieldInfo gWindowMargin_1_Fields[] = {
     {offsetof(WindowMargin, top), SettingType::Int, 0},

src/SumatraPDF.cpp

@@ -5285,12 +5285,14 @@ static LRESULT FrameOnCommand(MainWindow* win, HWND hwnd, UINT msg, WPARAM wp, L
             }
             break;
 
-        case CmdInvertColors:
+        case CmdInvertColors: {
             gGlobalPrefs->fixedPageUI.invertColors ^= true;
             UpdateDocumentColors();
             UpdateControlsColors(win);
             // UpdateUiForCurrentTab(win);
+            SaveSettings();
             break;
+        }
 
         case CmdNavigateBack:
             if (ctrl) {

src/SumatraStartup.cpp

@@ -608,7 +608,9 @@ static void UpdateGlobalPrefs(const Flags& i) {
         str::ReplacePtr(&gGlobalPrefs->inverseSearchCmdLine, cmdLine);
         gGlobalPrefs->enableTeXEnhancements = true;
     }
-    gGlobalPrefs->fixedPageUI.invertColors = i.invertColors;
+    if (i.invertColors) {
+        gGlobalPrefs->fixedPageUI.invertColors = true;
+    }
 
     char* arg = nullptr;
     char* param = nullptr;

src/Theme.cpp

@@ -159,11 +159,6 @@ void SetThemeByIndex(int themeIdx) {
     currentThemeIndex = themeIdx;
     gCurrentTheme = gThemes[currentThemeIndex];
     str::ReplaceWithCopy(&gGlobalPrefs->theme, gCurrentTheme->name);
-#if 0
-    // for light theme set invertColors
-    // don't invert for light theme, invert for dark themes
-    gGlobalPrefs->fixedPageUI.invertColors = (themeIdx == 0);
-#endif
     UpdateAfterThemeChange();
 };