Improve layout mode switching 2 (#2890)

gave92 · web-flow · commit 4bce96494d2b · 2021-01-07T22:45:58.000-05:00
diff --git a/Files/ViewModels/FolderSettingsViewModel.cs b/Files/ViewModels/FolderSettingsViewModel.cs
@@ -30,7 +30,6 @@ public FolderLayoutModes LayoutMode
                 if (SetProperty(ref LayoutPreference.LayoutMode, value, nameof(LayoutMode)))
                 {
                     UpdateLayoutPreferencesForPath(associatedInstance.FilesystemViewModel.WorkingDirectory, LayoutPreference);
-                    LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
                 }
             }
         }
@@ -83,30 +82,40 @@ public Type GetLayoutType(string folderPath)
             LayoutMode = FolderLayoutModes.GridView; // Grid View
 
             GridViewSize = Constants.Browser.GridViewBrowser.GridViewSizeLarge; // Size
+
+            LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
         });
 
         public RelayCommand ToggleLayoutModeGridViewMedium => new RelayCommand(() =>
         {
             LayoutMode = FolderLayoutModes.GridView; // Grid View
 
             GridViewSize = Constants.Browser.GridViewBrowser.GridViewSizeMedium; // Size
+
+            LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
         });
 
         public RelayCommand ToggleLayoutModeGridViewSmall => new RelayCommand(() =>
         {
             LayoutMode = FolderLayoutModes.GridView; // Grid View
 
             GridViewSize = Constants.Browser.GridViewBrowser.GridViewSizeSmall; // Size
+
+            LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
         });
 
         public RelayCommand ToggleLayoutModeTiles => new RelayCommand(() =>
         {
             LayoutMode = FolderLayoutModes.TilesView; // Tiles View
+
+            LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
         });
 
         public RelayCommand ToggleLayoutModeDetailsView => new RelayCommand(() =>
         {
             LayoutMode = FolderLayoutModes.DetailsView; // Details View
+
+            LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
         });
 
         public int GridViewSize
@@ -119,10 +128,12 @@ public int GridViewSize
                     if (LayoutMode == FolderLayoutModes.TilesView) // Size down from tiles to list
                     {
                         LayoutMode = 0;
+                        LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
                     }
                     else if (LayoutMode == FolderLayoutModes.GridView && value < Constants.Browser.GridViewBrowser.GridViewSizeSmall) // Size down from grid to tiles
                     {
                         LayoutMode = FolderLayoutModes.TilesView;
+                        LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
                     }
                     else if (LayoutMode != FolderLayoutModes.DetailsView) // Resize grid view
                     {
@@ -132,6 +143,7 @@ public int GridViewSize
                         if (LayoutMode != FolderLayoutModes.GridView) // Only update layout mode if it isn't already in grid view
                         {
                             LayoutMode = FolderLayoutModes.GridView;
+                            LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
                         }
                         else
                         {
@@ -146,6 +158,7 @@ public int GridViewSize
                     if (LayoutMode == 0) // Size up from list to tiles
                     {
                         LayoutMode = FolderLayoutModes.TilesView;
+                        LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
                     }
                     else // Size up from tiles to grid
                     {
@@ -155,6 +168,7 @@ public int GridViewSize
                         if (LayoutMode != FolderLayoutModes.GridView) // Only update layout mode if it isn't already in grid view
                         {
                             LayoutMode = FolderLayoutModes.GridView;
+                            LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
                         }
                         else
                         {
diff --git a/Files/Views/LayoutModes/GridViewBrowser.xaml.cs b/Files/Views/LayoutModes/GridViewBrowser.xaml.cs
@@ -67,10 +67,11 @@ private void FolderSettings_LayoutModeChangeRequested(object sender, EventArgs e
         {
             if (FolderSettings.LayoutMode == FolderLayoutModes.GridView || FolderSettings.LayoutMode == FolderLayoutModes.TilesView)
             {
-                var oldTemplate = FileList.ItemTemplate;
                 SetItemTemplate(); // Set ItemTemplate
-                if (oldTemplate != FileList.ItemTemplate)
+                var requestedIconSize = GetIconSize();
+                if (requestedIconSize != currentIconSize)
                 {
+                    currentIconSize = requestedIconSize;
                     ReloadItemIcons();
                 }
             }
@@ -87,7 +88,6 @@ private void SetItemTemplate()
             }
             else if (FolderSettings.LayoutMode == FolderLayoutModes.GridView)
             {
-                currentIconSize = GetIconSize(); // Get icon size for jumps from other layouts directly to a grid size
                 FolderSettings.GridViewSizeChangeRequested -= FolderSettings_GridViewSizeChangeRequested;
                 FolderSettings.GridViewSizeChangeRequested += FolderSettings_GridViewSizeChangeRequested;
             }
@@ -377,6 +377,10 @@ private uint GetIconSize()
             {
                 return Constants.Browser.GridViewBrowser.GridViewSizeSmall; // Small thumbnail
             }
+            else if (FolderSettings.GridViewSize <= Constants.Browser.GridViewBrowser.GridViewSizeSmall)
+            {
+                return Constants.Browser.GridViewBrowser.GridViewSizeSmall; // Small thumbnail
+            }
             else if (FolderSettings.GridViewSize <= Constants.Browser.GridViewBrowser.GridViewSizeMedium)
             {
                 return Constants.Browser.GridViewBrowser.GridViewSizeMedium; // Medium thumbnail
@@ -387,7 +391,7 @@ private uint GetIconSize()
             }
             else
             {
-                return 240; // Extra large thumbnail
+                return Constants.Browser.GridViewBrowser.GridViewSizeMax; // Extra large thumbnail
             }
         }
 
@@ -444,7 +448,7 @@ private void FileList_ChoosingItemContainer(ListViewBase sender, ChoosingItemCon
             }
             args.ItemContainer.DataContext = args.Item;
 
-            if (args.Item is ListedItem item && (!item.ItemPropertiesInitialized))
+            if (args.Item is ListedItem item && !item.ItemPropertiesInitialized)
             {
                 args.ItemContainer.PointerPressed += FileListGridItem_PointerPressed;
                 InitializeDrag(args.ItemContainer);

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ public FolderLayoutModes LayoutMode`
`30`	`30`	`if (SetProperty(ref LayoutPreference.LayoutMode, value, nameof(LayoutMode)))`
`31`	`31`	`{`
`32`	`32`	`UpdateLayoutPreferencesForPath(associatedInstance.FilesystemViewModel.WorkingDirectory, LayoutPreference);`
`33`		`- LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);`
`34`	`33`	`}`
`35`	`34`	`}`
`36`	`35`	`}`
`@@ -83,30 +82,40 @@ public Type GetLayoutType(string folderPath)`
`83`	`82`	`LayoutMode = FolderLayoutModes.GridView; // Grid View`
`84`	`83`
`85`	`84`	`GridViewSize = Constants.Browser.GridViewBrowser.GridViewSizeLarge; // Size`
	`85`	`+`
	`86`	`+ LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);`
`86`	`87`	`});`
`87`	`88`
`88`	`89`	`public RelayCommand ToggleLayoutModeGridViewMedium => new RelayCommand(() =>`
`89`	`90`	`{`
`90`	`91`	`LayoutMode = FolderLayoutModes.GridView; // Grid View`
`91`	`92`
`92`	`93`	`GridViewSize = Constants.Browser.GridViewBrowser.GridViewSizeMedium; // Size`
	`94`	`+`
	`95`	`+ LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);`
`93`	`96`	`});`
`94`	`97`
`95`	`98`	`public RelayCommand ToggleLayoutModeGridViewSmall => new RelayCommand(() =>`
`96`	`99`	`{`
`97`	`100`	`LayoutMode = FolderLayoutModes.GridView; // Grid View`
`98`	`101`
`99`	`102`	`GridViewSize = Constants.Browser.GridViewBrowser.GridViewSizeSmall; // Size`
	`103`	`+`
	`104`	`+ LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);`
`100`	`105`	`});`
`101`	`106`
`102`	`107`	`public RelayCommand ToggleLayoutModeTiles => new RelayCommand(() =>`
`103`	`108`	`{`
`104`	`109`	`LayoutMode = FolderLayoutModes.TilesView; // Tiles View`
	`110`	`+`
	`111`	`+ LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);`
`105`	`112`	`});`
`106`	`113`
`107`	`114`	`public RelayCommand ToggleLayoutModeDetailsView => new RelayCommand(() =>`
`108`	`115`	`{`
`109`	`116`	`LayoutMode = FolderLayoutModes.DetailsView; // Details View`
	`117`	`+`
	`118`	`+ LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);`
`110`	`119`	`});`
`111`	`120`
`112`	`121`	`public int GridViewSize`
`@@ -119,10 +128,12 @@ public int GridViewSize`
`119`	`128`	`if (LayoutMode == FolderLayoutModes.TilesView) // Size down from tiles to list`
`120`	`129`	`{`
`121`	`130`	`LayoutMode = 0;`
	`131`	`+ LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);`
`122`	`132`	`}`
`123`	`133`	`else if (LayoutMode == FolderLayoutModes.GridView && value < Constants.Browser.GridViewBrowser.GridViewSizeSmall) // Size down from grid to tiles`
`124`	`134`	`{`
`125`	`135`	`LayoutMode = FolderLayoutModes.TilesView;`
	`136`	`+ LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);`
`126`	`137`	`}`
`127`	`138`	`else if (LayoutMode != FolderLayoutModes.DetailsView) // Resize grid view`
`128`	`139`	`{`
`@@ -132,6 +143,7 @@ public int GridViewSize`
`132`	`143`	`if (LayoutMode != FolderLayoutModes.GridView) // Only update layout mode if it isn't already in grid view`
`133`	`144`	`{`
`134`	`145`	`LayoutMode = FolderLayoutModes.GridView;`
	`146`	`+ LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);`
`135`	`147`	`}`
`136`	`148`	`else`
`137`	`149`	`{`
`@@ -146,6 +158,7 @@ public int GridViewSize`
`146`	`158`	`if (LayoutMode == 0) // Size up from list to tiles`
`147`	`159`	`{`
`148`	`160`	`LayoutMode = FolderLayoutModes.TilesView;`
	`161`	`+ LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);`
`149`	`162`	`}`
`150`	`163`	`else // Size up from tiles to grid`
`151`	`164`	`{`
`@@ -155,6 +168,7 @@ public int GridViewSize`
`155`	`168`	`if (LayoutMode != FolderLayoutModes.GridView) // Only update layout mode if it isn't already in grid view`
`156`	`169`	`{`
`157`	`170`	`LayoutMode = FolderLayoutModes.GridView;`
	`171`	`+ LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);`
`158`	`172`	`}`
`159`	`173`	`else`
`160`	`174`	`{`
Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,11 @@ private void FolderSettings_LayoutModeChangeRequested(object sender, EventArgs e`
`67`	`67`	`{`
`68`	`68`	`if (FolderSettings.LayoutMode == FolderLayoutModes.GridView \|\| FolderSettings.LayoutMode == FolderLayoutModes.TilesView)`
`69`	`69`	`{`
`70`		`- var oldTemplate = FileList.ItemTemplate;`
`71`	`70`	`SetItemTemplate(); // Set ItemTemplate`
`72`		`- if (oldTemplate != FileList.ItemTemplate)`
	`71`	`+ var requestedIconSize = GetIconSize();`
	`72`	`+ if (requestedIconSize != currentIconSize)`
`73`	`73`	`{`
	`74`	`+ currentIconSize = requestedIconSize;`
`74`	`75`	`ReloadItemIcons();`
`75`	`76`	`}`
`76`	`77`	`}`
`@@ -87,7 +88,6 @@ private void SetItemTemplate()`
`87`	`88`	`}`
`88`	`89`	`else if (FolderSettings.LayoutMode == FolderLayoutModes.GridView)`
`89`	`90`	`{`
`90`		`- currentIconSize = GetIconSize(); // Get icon size for jumps from other layouts directly to a grid size`
`91`	`91`	`FolderSettings.GridViewSizeChangeRequested -= FolderSettings_GridViewSizeChangeRequested;`
`92`	`92`	`FolderSettings.GridViewSizeChangeRequested += FolderSettings_GridViewSizeChangeRequested;`
`93`	`93`	`}`
`@@ -377,6 +377,10 @@ private uint GetIconSize()`
`377`	`377`	`{`
`378`	`378`	`return Constants.Browser.GridViewBrowser.GridViewSizeSmall; // Small thumbnail`
`379`	`379`	`}`
	`380`	`+ else if (FolderSettings.GridViewSize <= Constants.Browser.GridViewBrowser.GridViewSizeSmall)`
	`381`	`+ {`
	`382`	`+ return Constants.Browser.GridViewBrowser.GridViewSizeSmall; // Small thumbnail`
	`383`	`+ }`
`380`	`384`	`else if (FolderSettings.GridViewSize <= Constants.Browser.GridViewBrowser.GridViewSizeMedium)`
`381`	`385`	`{`
`382`	`386`	`return Constants.Browser.GridViewBrowser.GridViewSizeMedium; // Medium thumbnail`
`@@ -387,7 +391,7 @@ private uint GetIconSize()`
`387`	`391`	`}`
`388`	`392`	`else`
`389`	`393`	`{`
`390`		`- return 240; // Extra large thumbnail`
	`394`	`+ return Constants.Browser.GridViewBrowser.GridViewSizeMax; // Extra large thumbnail`
`391`	`395`	`}`
`392`	`396`	`}`
`393`	`397`
`@@ -444,7 +448,7 @@ private void FileList_ChoosingItemContainer(ListViewBase sender, ChoosingItemCon`
`444`	`448`	`}`
`445`	`449`	`args.ItemContainer.DataContext = args.Item;`
`446`	`450`
`447`		`- if (args.Item is ListedItem item && (!item.ItemPropertiesInitialized))`
	`451`	`+ if (args.Item is ListedItem item && !item.ItemPropertiesInitialized)`
`448`	`452`	`{`
`449`	`453`	`args.ItemContainer.PointerPressed += FileListGridItem_PointerPressed;`
`450`	`454`	`InitializeDrag(args.ItemContainer);`