Hidden items are now dimmed (#2393)

yaira2 · web-flow · commit d238515e032e · 2020-11-19T16:49:06.000-05:00
diff --git a/Files/Filesystem/ListedItem.cs b/Files/Filesystem/ListedItem.cs
@@ -55,12 +55,12 @@ public bool LoadUnknownTypeGlyph
             set => SetProperty(ref _LoadUnknownTypeGlyph, value);
         }
 
-        private bool _IsDimmed;
+        private double opacity;
 
-        public bool IsDimmed
+        public double Opacity
         {
-            get => _IsDimmed;
-            set => SetProperty(ref _IsDimmed, value);
+            get => opacity;
+            set => SetProperty(ref opacity, value);
         }
 
         private CloudDriveSyncStatusUI _SyncStatusUI;
diff --git a/Files/View Models/ItemViewModel.cs b/Files/View Models/ItemViewModel.cs
@@ -918,6 +918,14 @@ await DialogDisplayHelper.ShowDialogAsync(
                 }
                 catch (ArgumentException) { }
 
+                bool isHidden = (((FileAttributes)findData.dwFileAttributes & FileAttributes.Hidden) == FileAttributes.Hidden);
+                double opacity = 1;
+
+                if (isHidden)
+                {
+                    opacity = 0.4;
+                }
+
                 CurrentFolder = new ListedItem(_rootFolder.FolderRelativeId, returnformat)
                 {
                     PrimaryItemAttribute = StorageItemTypes.Folder,
@@ -927,7 +935,8 @@ await DialogDisplayHelper.ShowDialogAsync(
                     ItemType = _rootFolder.DisplayType,
                     LoadFolderGlyph = true,
                     FileImage = null,
-                    IsHiddenItem = ((FileAttributes)findData.dwFileAttributes & FileAttributes.Hidden) == FileAttributes.Hidden,
+                    IsHiddenItem = isHidden,
+                    Opacity = opacity,
                     LoadFileIcon = false,
                     ItemPath = string.IsNullOrEmpty(_rootFolder.Path) ? _currentStorageFolder.Path : _rootFolder.Path,
                     LoadUnknownTypeGlyph = false,
@@ -1420,6 +1429,14 @@ private void AddFolder(WIN32_FIND_DATA findData, string pathRoot, string dateRet
             }
             var itemPath = Path.Combine(pathRoot, findData.cFileName);
 
+            bool isHidden = (((FileAttributes)findData.dwFileAttributes & FileAttributes.Hidden) == FileAttributes.Hidden);
+            double opacity = 1;
+
+            if (isHidden)
+            {
+                opacity = 0.4;
+            }
+
             _filesAndFolders.Add(new ListedItem(null, dateReturnFormat)
             {
                 PrimaryItemAttribute = StorageItemTypes.Folder,
@@ -1428,7 +1445,8 @@ private void AddFolder(WIN32_FIND_DATA findData, string pathRoot, string dateRet
                 ItemType = "FileFolderListItem".GetLocalized(),
                 LoadFolderGlyph = true,
                 FileImage = null,
-                IsHiddenItem = ((FileAttributes)findData.dwFileAttributes & FileAttributes.Hidden) == FileAttributes.Hidden,
+                IsHiddenItem = isHidden,
+                Opacity = opacity,
                 LoadFileIcon = false,
                 ItemPath = itemPath,
                 LoadUnknownTypeGlyph = false,
@@ -1542,11 +1560,20 @@ private void AddFile(WIN32_FIND_DATA findData, string pathRoot, string dateRetur
                             containsFilesOrFolders = CheckForFilesFolders(target);
                         }
 
+                        bool isHidden = (((FileAttributes)findData.dwFileAttributes & FileAttributes.Hidden) == FileAttributes.Hidden);
+                        double opacity = 1;
+
+                        if (isHidden)
+                        {
+                            opacity = 0.4;
+                        }
+
                         _filesAndFolders.Add(new ShortcutItem(null, dateReturnFormat)
                         {
                             PrimaryItemAttribute = (bool)response.Message["IsFolder"] ? StorageItemTypes.Folder : StorageItemTypes.File,
                             FileExtension = itemFileExtension,
-                            IsHiddenItem = ((FileAttributes)findData.dwFileAttributes & FileAttributes.Hidden) == FileAttributes.Hidden,
+                            IsHiddenItem = isHidden,
+                            Opacity = opacity,
                             FileImage = !(bool)response.Message["IsFolder"] ? icon : null,
                             LoadFileIcon = !(bool)response.Message["IsFolder"] && itemThumbnailImgVis,
                             LoadUnknownTypeGlyph = !(bool)response.Message["IsFolder"] && !isUrl && itemEmptyImgVis,
@@ -1571,6 +1598,14 @@ private void AddFile(WIN32_FIND_DATA findData, string pathRoot, string dateRetur
             }
             else
             {
+                bool isHidden = (((FileAttributes)findData.dwFileAttributes & FileAttributes.Hidden) == FileAttributes.Hidden);
+                double opacity = 1;
+
+                if (isHidden)
+                {
+                    opacity = 0.4;
+                }
+
                 _filesAndFolders.Add(new ListedItem(null, dateReturnFormat)
                 {
                     PrimaryItemAttribute = StorageItemTypes.File,
@@ -1580,7 +1615,8 @@ private void AddFile(WIN32_FIND_DATA findData, string pathRoot, string dateRetur
                     LoadFileIcon = itemThumbnailImgVis,
                     LoadFolderGlyph = itemFolderImgVis,
                     ItemName = itemName,
-                    IsHiddenItem = ((FileAttributes)findData.dwFileAttributes & FileAttributes.Hidden) == FileAttributes.Hidden,
+                    IsHiddenItem = isHidden,
+                    Opacity = opacity,
                     ItemDateModifiedReal = itemModifiedDate,
                     ItemDateAccessedReal = itemLastAccessDate,
                     ItemDateCreatedReal = itemCreatedDate,
diff --git a/Files/Views/LayoutModes/GenericFileBrowser.xaml b/Files/Views/LayoutModes/GenericFileBrowser.xaml
@@ -21,10 +21,6 @@
 
     <local:BaseLayout.Resources>
         <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
-        <converters:BoolToObjectConverter
-            x:Key="BoolToOpacityConverter"
-            FalseValue="1"
-            TrueValue="0.4" />
 
         <MenuFlyout
             x:Key="BaseLayoutContextFlyout"
@@ -735,7 +731,7 @@
                             <Grid
                                 x:Name="Icon"
                                 EffectiveViewportChanged="Icon_EffectiveViewportChanged"
-                                Opacity="{x:Bind IsDimmed, Converter={StaticResource BoolToOpacityConverter}, Mode=OneWay}"
+                                Opacity="{x:Bind Opacity, Mode=OneWay}"
                                 ToolTipService.ToolTip="{x:Bind FolderTooltipText}">
                                 <Rectangle
                                     x:Name="CutIndicator"
diff --git a/Files/Views/LayoutModes/GenericFileBrowser.xaml.cs b/Files/Views/LayoutModes/GenericFileBrowser.xaml.cs
@@ -211,13 +211,20 @@ public override void ResetItemOpacity()
 
             foreach (ListedItem listedItem in items)
             {
-                listedItem.IsDimmed = false;
+                if (listedItem.IsHiddenItem)
+                {
+                    listedItem.Opacity = 0.4;
+                }
+                else
+                {
+                    listedItem.Opacity = 1;
+                }
             }
         }
 
         public override void SetItemOpacity(ListedItem item)
         {
-            item.IsDimmed = true;
+            item.Opacity = 0.4;
         }
 
         private async void ViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
diff --git a/Files/Views/LayoutModes/GridViewBrowser.xaml b/Files/Views/LayoutModes/GridViewBrowser.xaml
@@ -18,10 +18,6 @@
     mc:Ignorable="d">
     <local:BaseLayout.Resources>
         <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
-        <converters:BoolToObjectConverter
-            x:Key="BoolToOpacityConverter"
-            FalseValue="1"
-            TrueValue="0.4" />
 
         <MenuFlyout
             x:Key="BaseLayoutContextFlyout"
@@ -566,7 +562,7 @@
                     Grid.Row="0"
                     Width="{x:Bind local:App.AppSettings.GridViewSize, Mode=OneWay}"
                     Height="{x:Bind local:App.AppSettings.GridViewSize, Mode=OneWay}"
-                    Opacity="{x:Bind IsDimmed, Converter={StaticResource BoolToOpacityConverter}, Mode=OneWay}"
+                    Opacity="{x:Bind Opacity, Mode=OneWay}"
                     Tag="ItemImage">
                     <Grid
                         x:Name="Picture"
@@ -718,7 +714,7 @@
                     Grid.Column="1"
                     Height="Auto"
                     MinHeight="100"
-                    Opacity="{x:Bind IsDimmed, Converter={StaticResource BoolToOpacityConverter}, Mode=OneWay}"
+                    Opacity="{x:Bind Opacity, Mode=OneWay}"
                     Tag="ItemImage">
                     <Grid
                         x:Name="Picture"
diff --git a/Files/Views/LayoutModes/GridViewBrowser.xaml.cs b/Files/Views/LayoutModes/GridViewBrowser.xaml.cs
@@ -219,13 +219,20 @@ public override void ResetItemOpacity()
 
             foreach (ListedItem listedItem in items)
             {
-                listedItem.IsDimmed = false;
+                if (listedItem.IsHiddenItem)
+                {
+                    listedItem.Opacity = 0.4;
+                }
+                else
+                {
+                    listedItem.Opacity = 1;
+                }
             }
         }
 
         public override void SetItemOpacity(ListedItem item)
         {
-            item.IsDimmed = true;
+            item.Opacity = 0.4;
         }
 
         private void RenameTextBox_KeyDown(object sender, KeyRoutedEventArgs e)

Original file line number	Diff line number	Diff line change
`@@ -55,12 +55,12 @@ public bool LoadUnknownTypeGlyph`
`55`	`55`	`set => SetProperty(ref _LoadUnknownTypeGlyph, value);`
`56`	`56`	`}`
`57`	`57`
`58`		`- private bool _IsDimmed;`
	`58`	`+ private double opacity;`
`59`	`59`
`60`		`- public bool IsDimmed`
	`60`	`+ public double Opacity`
`61`	`61`	`{`
`62`		`- get => _IsDimmed;`
`63`		`- set => SetProperty(ref _IsDimmed, value);`
	`62`	`+ get => opacity;`
	`63`	`+ set => SetProperty(ref opacity, value);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`private CloudDriveSyncStatusUI _SyncStatusUI;`
Original file line number	Diff line number	Diff line change
`@@ -211,13 +211,20 @@ public override void ResetItemOpacity()`
`211`	`211`
`212`	`212`	`foreach (ListedItem listedItem in items)`
`213`	`213`	`{`
`214`		`- listedItem.IsDimmed = false;`
	`214`	`+ if (listedItem.IsHiddenItem)`
	`215`	`+ {`
	`216`	`+ listedItem.Opacity = 0.4;`
	`217`	`+ }`
	`218`	`+ else`
	`219`	`+ {`
	`220`	`+ listedItem.Opacity = 1;`
	`221`	`+ }`
`215`	`222`	`}`
`216`	`223`	`}`
`217`	`224`
`218`	`225`	`public override void SetItemOpacity(ListedItem item)`
`219`	`226`	`{`
`220`		`- item.IsDimmed = true;`
	`227`	`+ item.Opacity = 0.4;`
`221`	`228`	`}`
`222`	`229`
`223`	`230`	`private async void ViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -219,13 +219,20 @@ public override void ResetItemOpacity()`
`219`	`219`
`220`	`220`	`foreach (ListedItem listedItem in items)`
`221`	`221`	`{`
`222`		`- listedItem.IsDimmed = false;`
	`222`	`+ if (listedItem.IsHiddenItem)`
	`223`	`+ {`
	`224`	`+ listedItem.Opacity = 0.4;`
	`225`	`+ }`
	`226`	`+ else`
	`227`	`+ {`
	`228`	`+ listedItem.Opacity = 1;`
	`229`	`+ }`
`223`	`230`	`}`
`224`	`231`	`}`
`225`	`232`
`226`	`233`	`public override void SetItemOpacity(ListedItem item)`
`227`	`234`	`{`
`228`		`- item.IsDimmed = true;`
	`235`	`+ item.Opacity = 0.4;`
`229`	`236`	`}`
`230`	`237`
`231`	`238`	`private void RenameTextBox_KeyDown(object sender, KeyRoutedEventArgs e)`