Browse Source

Replace `Path` icons with `Image` elements, update icon resources, and remove unused geometries. Simplify related event handling logic.

Ruben 3 months ago
parent
commit
9b25a2b505

File diff suppressed because it is too large
+ 2 - 1
src/PicView.Avalonia/PicViewTheme/Icons.axaml


+ 2 - 4
src/PicView.Avalonia/Views/ImageInfoView.axaml

@@ -244,11 +244,9 @@
                 IsEnabled="{CompiledBinding PicViewer.FileInfo.Value,
                                             Converter={x:Static ObjectConverters.IsNotNull}}">
                 <MenuItem.Icon>
-                    <Path
-                        Data="{StaticResource FilePropertiesGeometry}"
-                        Fill="{DynamicResource MainTextColor}"
+                    <Image
                         Height="12"
-                        Stretch="Fill"
+                        Source="{StaticResource FileUserImage}"
                         Width="12" />
                 </MenuItem.Icon>
             </MenuItem>

+ 6 - 9
src/PicView.Avalonia/Views/MainView.axaml

@@ -282,10 +282,9 @@
                                 Padding="8,4"
                                 x:Name="HistoryFileButton">
                                 <StackPanel Orientation="Horizontal">
-                                    <Path
-                                        Data="{StaticResource FilePropertiesGeometry}"
-                                        Fill="{StaticResource Brush0}"
+                                    <Image
                                         Height="12"
+                                        Source="{StaticResource SquareLibrary}"
                                         Stretch="Fill"
                                         Width="12"
                                         x:Name="HistoryFileButtonPath" />
@@ -735,11 +734,9 @@
                     IsEnabled="{CompiledBinding PicViewer.FileInfo.Value,
                                                 Converter={x:Static ObjectConverters.IsNotNull}}">
                     <MenuItem.Icon>
-                        <Path
-                            Data="{StaticResource FilePropertiesGeometry}"
-                            Fill="{StaticResource Brush0}"
+                        <Image
                             Height="12"
-                            Stretch="Fill"
+                            Source="{StaticResource FileUserImage}"
                             Width="12" />
                     </MenuItem.Icon>
                 </MenuItem>
@@ -749,7 +746,7 @@
                     <MenuItem.Icon>
                         <Image
                             Height="12"
-                            Source="{StaticResource BatchResizeImage}"
+                            Source="{StaticResource UpscaleImage}"
                             Width="12" />
                     </MenuItem.Icon>
                 </MenuItem>
@@ -759,7 +756,7 @@
                     <MenuItem.Icon>
                         <Image
                             Height="12"
-                            Source="{StaticResource BatchResizeImage}"
+                            Source="{StaticResource UpscaleImage}"
                             Width="12" />
                     </MenuItem.Icon>
                 </MenuItem>

+ 0 - 2
src/PicView.Avalonia/Views/MainView.axaml.cs

@@ -67,12 +67,10 @@ public partial class MainView : UserControl
             HistoryFileButton.PointerEntered += delegate       
             {
                 HistoryFileNameTextBlock.Foreground = secondaryBrush;
-                HistoryFileButtonPath.Fill = secondaryBrush;
             };
             HistoryFileButton.PointerExited += delegate       
             {
                 HistoryFileNameTextBlock.Foreground = brush;
-                HistoryFileButtonPath.Fill = brush;
             };
         }
 

Some files were not shown because too many files changed in this diff