Browse Source

Move alt hover buttons to left on osx

Ruben 5 months ago
parent
commit
abf7eb9756

+ 3 - 3
src/PicView.Avalonia/Views/MainView.axaml

@@ -1258,9 +1258,9 @@
             Orientation="Horizontal"
             Orientation="Horizontal"
             VerticalAlignment="Top"
             VerticalAlignment="Top"
             x:Name="AltButtonsPanel">
             x:Name="AltButtonsPanel">
-            <buttons:AltMinimize />
-            <buttons:AltRestore />
-            <buttons:AltClose />
+            <buttons:AltMinimize x:Name="AltMinimize" />
+            <buttons:AltRestore x:Name="AltRestore" />
+            <buttons:AltClose x:Name="AltClose" />
         </StackPanel>
         </StackPanel>
         <buttons:GalleryShortcut
         <buttons:GalleryShortcut
             HorizontalAlignment="Right"
             HorizontalAlignment="Right"

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

@@ -2,6 +2,7 @@
 using Avalonia;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Input;
+using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Media;
 using Avalonia.Threading;
 using Avalonia.Threading;
 using PicView.Avalonia.Converters;
 using PicView.Avalonia.Converters;
@@ -25,6 +26,14 @@ public partial class MainView : UserControl
     {
     {
         InitializeComponent();
         InitializeComponent();
 
 
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+        {
+            // Move alt hover to left side on macOS and switch button order
+            AltButtonsPanel.HorizontalAlignment = HorizontalAlignment.Left; 
+            AltButtonsPanel.Children.Move(AltButtonsPanel.Children.IndexOf(AltClose),0);
+            AltButtonsPanel.Children.Move(AltButtonsPanel.Children.IndexOf(AltMinimize),2);
+        }
+
         if (!Settings.Theme.Dark && !Settings.Theme.GlassTheme)
         if (!Settings.Theme.Dark && !Settings.Theme.GlassTheme)
         {
         {
             if (!Application.Current.TryGetResource("MainTextColor",
             if (!Application.Current.TryGetResource("MainTextColor",