Feature: Removed web shortcut icon placeholder (#14913)

files-community · Mar 7, 2024 · 5ba7ad0 · 5ba7ad0
1 parent e853f42
commit 5ba7ad0
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 75 deletions.
diff --git a/src/Files.App/Data/Items/ListedItem.cs b/src/Files.App/Data/Items/ListedItem.cs
@@ -70,13 +70,6 @@ public bool LoadFileIcon
 			set => SetProperty(ref loadFileIcon, value);
 		}
 
-		private bool loadWebShortcutGlyph;
-		public bool LoadWebShortcutGlyph
-		{
-			get => loadWebShortcutGlyph;
-			set => SetProperty(ref loadWebShortcutGlyph, value);
-		}
-
 		private bool loadCustomIcon;
 		public bool LoadCustomIcon
 		{
@@ -176,7 +169,6 @@ public BitmapImage FileImage
 					{
 						LoadFileIcon = true;
 						NeedsPlaceholderGlyph = false;
-						LoadWebShortcutGlyph = false;
 					}
 				}
 			}

diff --git a/src/Files.App/Data/Models/SelectedItemsPropertiesViewModel.cs b/src/Files.App/Data/Models/SelectedItemsPropertiesViewModel.cs
@@ -5,9 +5,6 @@
 using Files.Shared.Helpers;
 using System.Windows.Input;
 using TagLib;
-using Windows.Storage;
-using Windows.Storage.FileProperties;
-using Windows.Storage.Pickers;
 
 namespace Files.App.Data.Models
 {
@@ -484,7 +481,7 @@ public ICommand FormatDriveCommand
 			get => formatDriveCommand;
 			set => SetProperty(ref formatDriveCommand, value);
 		}
-		
+
 		private ICommand editAlbumCoverCommand;
 		public ICommand EditAlbumCoverCommand
 		{
@@ -522,7 +519,7 @@ public bool IsItemSelected
 
 		public SelectedItemsPropertiesViewModel()
 		{
-			
+
 		}
 
 		private bool isSelectedItemImage = false;
@@ -632,13 +629,6 @@ public bool ShortcutItemArgumentsVisibility
 			set => SetProperty(ref shortcutItemArgumentsVisibility, value);
 		}
 
-		private bool loadLinkIcon;
-		public bool LoadLinkIcon
-		{
-			get => loadLinkIcon;
-			set => SetProperty(ref loadLinkIcon, value);
-		}
-
 		private RelayCommand shortcutItemOpenLinkCommand;
 		public RelayCommand ShortcutItemOpenLinkCommand
 		{
@@ -771,21 +761,21 @@ public bool IsUnblockFileSelected
 			get => isUnblockFileSelected;
 			set => SetProperty(ref isUnblockFileSelected, value);
 		}
-		
+
 		private bool isAblumCoverModified;
 		public bool IsAblumCoverModified
 		{
 			get => isAblumCoverModified;
 			set => SetProperty(ref isAblumCoverModified, value);
 		}
-		
+
 		private bool isEditAlbumCoverVisible;
 		public bool IsEditAlbumCoverVisible
 		{
 			get => isEditAlbumCoverVisible;
 			set => SetProperty(ref isEditAlbumCoverVisible, value);
 		}
-		
+
 		private Picture modifiedAlbumCover;
 		public Picture ModifiedAlbumCover
 		{

diff --git a/src/Files.App/UserControls/FileIcon.xaml b/src/Files.App/UserControls/FileIcon.xaml
@@ -43,14 +43,6 @@
 			x:Load="{x:Bind ViewModel.LoadCustomIcon, Mode=OneWay}"
 			Source="{x:Bind CustomIconImageSource}" />
 
-		<FontIcon
-			x:Name="WebShortcutGlyph"
-			HorizontalAlignment="Left"
-			VerticalAlignment="Stretch"
-			x:Load="{x:Bind ViewModel.LoadLinkIcon, Mode=OneWay}"
-			FontSize="{x:Bind ItemSize}"
-			Glyph="&#xE71B;" />
-
 		<Image
 			x:Name="ItemIcon"
 			Height="{x:Bind ItemSize}"

diff --git a/src/Files.App/Utils/Storage/Enumerators/UniversalStorageEnumerator.cs b/src/Files.App/Utils/Storage/Enumerators/UniversalStorageEnumerator.cs
@@ -282,7 +282,6 @@ public static async Task<ListedItem> AddFileAsync(
 						Opacity = 1,
 						FileImage = null,
 						LoadFileIcon = itemThumbnailImgVis,
-						LoadWebShortcutGlyph = isUrl,
 						ItemNameRaw = itemName,
 						ItemDateModifiedReal = itemModifiedDate,
 						ItemDateCreatedReal = itemCreatedDate,

diff --git a/src/Files.App/Utils/Storage/Enumerators/Win32StorageEnumerator.cs b/src/Files.App/Utils/Storage/Enumerators/Win32StorageEnumerator.cs
@@ -3,7 +3,6 @@
 
 using Files.Core.Services.SizeProvider;
 using Files.Shared.Helpers;
-using Microsoft.UI.Xaml.Media.Imaging;
 using System.IO;
 using Vanara.PInvoke;
 using Windows.Storage;
@@ -287,7 +286,6 @@ CancellationToken cancellationToken
 					Opacity = opacity,
 					FileImage = null,
 					LoadFileIcon = itemThumbnailImgVis,
-					LoadWebShortcutGlyph = false,
 					ItemNameRaw = itemName,
 					ItemDateModifiedReal = itemModifiedDate,
 					ItemDateAccessedReal = itemLastAccessDate,
@@ -316,7 +314,6 @@ CancellationToken cancellationToken
 					Opacity = opacity,
 					FileImage = null,
 					LoadFileIcon = !shInfo.IsFolder && itemThumbnailImgVis,
-					LoadWebShortcutGlyph = !shInfo.IsFolder && isUrl && itemEmptyImgVis,
 					ItemNameRaw = itemName,
 					ItemDateModifiedReal = itemModifiedDate,
 					ItemDateAccessedReal = itemLastAccessDate,

diff --git a/src/Files.App/ViewModels/Properties/Items/FileProperties.cs b/src/Files.App/ViewModels/Properties/Items/FileProperties.cs
@@ -123,7 +123,6 @@ public override async Task GetSpecialPropertiesAsync()
 			{
 				ViewModel.ItemCreatedTimestampReal = Item.ItemDateCreatedReal;
 				ViewModel.ItemAccessedTimestampReal = Item.ItemDateAccessedReal;
-				ViewModel.LoadLinkIcon = Item.LoadWebShortcutGlyph;
 				if (Item.IsLinkItem || string.IsNullOrWhiteSpace(((ShortcutItem)Item).TargetPath))
 				{
 					// Can't show any other property

diff --git a/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml b/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml
@@ -260,15 +260,7 @@
 										x:Load="True"
 										Source="{x:Bind IconOverlay, Mode=OneWay}"
 										Stretch="Uniform" />
-									<Viewbox
-										x:Name="WebShortcutGlyph"
-										MaxWidth="20"
-										MaxHeight="20"
-										HorizontalAlignment="Stretch"
-										VerticalAlignment="Stretch"
-										Visibility="{x:Bind LoadWebShortcutGlyph, Mode=OneWay}">
-										<FontIcon FontSize="20" Glyph="&#xE71B;" />
-									</Viewbox>
+
 									<Border
 										x:Name="ShortcutGlyphElement"
 										HorizontalAlignment="Left"

diff --git a/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml b/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml
@@ -940,10 +940,6 @@
 												Margin="2"
 												x:Load="{x:Bind NeedsPlaceholderGlyph, Mode=OneWay}" />
 
-											<FontIcon
-												x:Name="WebShortcutGlyph"
-												x:Load="{x:Bind LoadWebShortcutGlyph, Mode=OneWay}"
-												Glyph="&#xE71B;" />
 											<Image
 												x:Name="IconOverlay"
 												Width="16"

diff --git a/src/Files.App/Views/Layouts/GridLayoutPage.xaml b/src/Files.App/Views/Layouts/GridLayoutPage.xaml
@@ -149,18 +149,6 @@
 							Source="{x:Bind IconOverlay, Mode=OneWay}"
 							Stretch="Uniform" />
 
-						<Viewbox
-							x:Name="WebShortcutGlyph"
-							MaxWidth="{Binding ElementName=PageRoot, Path=ItemWidthGridView, Mode=OneWay}"
-							MaxHeight="{Binding ElementName=PageRoot, Path=ItemWidthGridView, Mode=OneWay}"
-							Margin="12"
-							HorizontalAlignment="Stretch"
-							VerticalAlignment="Stretch"
-							x:Load="{x:Bind LoadWebShortcutGlyph, Mode=OneWay}"
-							x:Phase="1">
-							<FontIcon FontSize="28" Glyph="&#xE71B;" />
-						</Viewbox>
-
 						<Viewbox
 							x:Name="ShortcutGlyphElement"
 							Width="16"
@@ -336,10 +324,6 @@
 								Margin="2"
 								x:Load="{x:Bind NeedsPlaceholderGlyph, Mode=OneWay}" />
 
-							<FontIcon
-								x:Name="WebShortcutGlyph"
-								x:Load="{x:Bind LoadWebShortcutGlyph, Mode=OneWay}"
-								Glyph="&#xE71B;" />
 							<Image
 								x:Name="IconOverlay"
 								Width="16"
@@ -538,16 +522,6 @@
 							Source="{x:Bind IconOverlay, Mode=OneWay}"
 							Stretch="Uniform" />
 
-						<Viewbox
-							x:Name="WebShortcutGlyph"
-							MaxWidth="60"
-							HorizontalAlignment="Center"
-							VerticalAlignment="Center"
-							x:Load="{x:Bind LoadWebShortcutGlyph, Mode=OneWay}"
-							x:Phase="1">
-							<FontIcon FontSize="28" Glyph="&#xE71B;" />
-						</Viewbox>
-
 						<Viewbox
 							x:Name="ShortcutGlyphElement"
 							Width="16"