fixed: "Toolbar" and "Gallery Panel" re-enabled after quitting from f…

…ull screen mode #1705
d2phap · Dec 12, 2023 · a2ef06f · a2ef06f
1 parent 31a32f6
commit a2ef06f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/Source/ImageGlass/FrmMain.cs b/Source/ImageGlass/FrmMain.cs
@@ -51,7 +51,7 @@ public partial class FrmMain : ThemedForm
     private bool _isFramelessBeforeFullscreen;
     private bool _isWindowFitBeforeFullscreen;
     private bool _showToolbar = true;
-    private bool _showThumbnails = true;
+    private bool _showGallery = true;
     private Rectangle _windowBound;
     private FormWindowState _windowState = FormWindowState.Normal;
 

diff --git a/Source/ImageGlass/FrmMain/FrmMain.Configs.cs b/Source/ImageGlass/FrmMain/FrmMain.Configs.cs
@@ -329,12 +329,6 @@ public async Task SaveConfigsOnClosing()
             WindowSettings.SetFrmMainPlacementConfig(wp);
         }
 
-        // correct the settings when Full screen mode is enabled
-        if (Config.EnableFullScreen)
-        {
-            Config.ShowToolbar = _showToolbar;
-            Config.ShowGallery = _showThumbnails;
-        }
 
         Config.LastSeenImagePath = Local.Images.GetFilePath(Local.CurrentIndex);
         Config.ZoomLockValue = PicMain.ZoomFactor * 100f;

diff --git a/Source/ImageGlass/FrmMain/FrmMain.IGMethods.cs b/Source/ImageGlass/FrmMain/FrmMain.IGMethods.cs
@@ -2462,7 +2462,7 @@ public void SetFullScreenMode(bool enable = true,
             _windowBound = Bounds;
             _windowState = WindowState;
             if (hideToolbar) _showToolbar = Config.ShowToolbar;
-            if (hideThumbnails) _showThumbnails = Config.ShowGallery;
+            if (hideThumbnails) _showGallery = Config.ShowGallery;
 
             if (changeWindowState)
             {
@@ -2496,7 +2496,7 @@ public void SetFullScreenMode(bool enable = true,
 
             // restore last state of the window
             if (hideToolbar) Config.ShowToolbar = _showToolbar;
-            if (hideThumbnails) Config.ShowGallery = _showThumbnails;
+            if (hideThumbnails) Config.ShowGallery = _showGallery;
 
             if (hideToolbar && Config.ShowToolbar)
             {