From f5090eaaebab9eced511c54c5b966cf85e85ffae Mon Sep 17 00:00:00 2001 From: Ruben Date: Tue, 15 Oct 2024 20:27:29 +0200 Subject: [PATCH] Use ClickMode press by default --- src/PicView.Avalonia.Win32/Views/AboutWindow.axaml | 1 + src/PicView.Avalonia.Win32/Views/ExifWindow.axaml | 3 +++ src/PicView.Avalonia.Win32/Views/KeybindingsWindow.axaml | 2 ++ src/PicView.Avalonia.Win32/Views/SettingsWindow.axaml | 2 ++ src/PicView.Avalonia.Win32/Views/WinTitleBar.axaml | 3 +++ src/PicView.Avalonia/PicViewTheme/Controls/Button.axaml | 1 + src/PicView.Avalonia/Views/UC/Buttons/AltClose.axaml | 1 + src/PicView.Avalonia/Views/UC/Buttons/AltMinimize.axaml | 1 + src/PicView.Avalonia/Views/UC/Buttons/AltRestore.axaml | 1 + .../Views/UC/Buttons/StarOutlineButtons.axaml | 4 ++++ src/PicView.Avalonia/Views/UC/Menus/FileMenu.axaml | 1 + src/PicView.Avalonia/Views/UC/Menus/ImageMenu.axaml | 1 + src/PicView.Avalonia/Views/UC/Menus/SettingsMenu.axaml | 1 + src/PicView.Avalonia/Views/UC/Menus/ToolsMenu.axaml | 1 + 14 files changed, 23 insertions(+) diff --git a/src/PicView.Avalonia.Win32/Views/AboutWindow.axaml b/src/PicView.Avalonia.Win32/Views/AboutWindow.axaml index b63c31616..b539de514 100644 --- a/src/PicView.Avalonia.Win32/Views/AboutWindow.axaml +++ b/src/PicView.Avalonia.Win32/Views/AboutWindow.axaml @@ -46,6 +46,7 @@ BorderThickness="0" Classes="hover" Click="Close" + ClickMode="Release" CornerRadius="0,8,0,0" Data="{StaticResource CloseGeometry}" DockPanel.Dock="Right" diff --git a/src/PicView.Avalonia.Win32/Views/ExifWindow.axaml b/src/PicView.Avalonia.Win32/Views/ExifWindow.axaml index 39792d823..5ac6ca879 100644 --- a/src/PicView.Avalonia.Win32/Views/ExifWindow.axaml +++ b/src/PicView.Avalonia.Win32/Views/ExifWindow.axaml @@ -63,6 +63,7 @@ BorderBrush="{DynamicResource MainBorderColor}" BorderThickness="0,0,1,0" Classes="noBorderHover" + ClickMode="Release" Command="{CompiledBinding RecycleFileCommand}" Height="28" Width="130" @@ -138,6 +139,7 @@ BorderThickness="1,0,1,0" Classes="hover" Click="Minimize" + ClickMode="Release" Data="{StaticResource MinimizeGeometry}" DockPanel.Dock="Right" Foreground="{DynamicResource MainTextColor}" @@ -152,6 +154,7 @@ BorderThickness="0,0,1,0" Classes="hover" Click="Close" + ClickMode="Release" Data="{StaticResource CloseGeometry}" DockPanel.Dock="Right" Foreground="{DynamicResource MainTextColor}" diff --git a/src/PicView.Avalonia.Win32/Views/KeybindingsWindow.axaml b/src/PicView.Avalonia.Win32/Views/KeybindingsWindow.axaml index 8ccec4857..a57e8af51 100644 --- a/src/PicView.Avalonia.Win32/Views/KeybindingsWindow.axaml +++ b/src/PicView.Avalonia.Win32/Views/KeybindingsWindow.axaml @@ -49,6 +49,7 @@ BorderThickness="0,0,1,1" Classes="hover" Click="Close" + ClickMode="Release" CornerRadius="0,8,0,0" Data="{StaticResource CloseGeometry}" DockPanel.Dock="Right" @@ -65,6 +66,7 @@ BorderBrush="{DynamicResource MainBorderColor}" BorderThickness="1,0,1,1" Classes="hover" + ClickMode="Release" Data="{StaticResource MinimizeGeometry}" DockPanel.Dock="Right" Foreground="{DynamicResource MainTextColor}" diff --git a/src/PicView.Avalonia.Win32/Views/SettingsWindow.axaml b/src/PicView.Avalonia.Win32/Views/SettingsWindow.axaml index 5b3f613c7..8d2f28560 100644 --- a/src/PicView.Avalonia.Win32/Views/SettingsWindow.axaml +++ b/src/PicView.Avalonia.Win32/Views/SettingsWindow.axaml @@ -50,6 +50,7 @@ BorderThickness="0,0,1,0" Classes="hover" Click="Close" + ClickMode="Release" CornerRadius="0,8,0,0" Data="{StaticResource CloseGeometry}" DockPanel.Dock="Right" @@ -67,6 +68,7 @@ BorderThickness="1,0,1,0" Classes="hover" Click="Minimize" + ClickMode="Release" Data="{StaticResource MinimizeGeometry}" DockPanel.Dock="Right" Foreground="{DynamicResource MainTextColor}" diff --git a/src/PicView.Avalonia.Win32/Views/WinTitleBar.axaml b/src/PicView.Avalonia.Win32/Views/WinTitleBar.axaml index 617aa37d3..8436b78d6 100644 --- a/src/PicView.Avalonia.Win32/Views/WinTitleBar.axaml +++ b/src/PicView.Avalonia.Win32/Views/WinTitleBar.axaml @@ -100,6 +100,7 @@ BorderBrush="{DynamicResource MainBorderColor}" BorderThickness="0,0,1,0" Classes="hover" + ClickMode="Release" Command="{CompiledBinding ExitCommand}" CornerRadius="0,8,0,0" Data="{StaticResource CloseGeometry}" @@ -115,6 +116,7 @@ BorderBrush="{DynamicResource MainBorderColor}" BorderThickness="0,0,1,0" Classes="hover" + ClickMode="Release" Command="{CompiledBinding ToggleFullscreenCommand}" Data="{StaticResource FullscreenGeometry}" DockPanel.Dock="Right" @@ -129,6 +131,7 @@ BorderBrush="{DynamicResource MainBorderColor}" BorderThickness="1,0,1,0" Classes="hover" + ClickMode="Release" Command="{CompiledBinding MinimizeCommand}" Data="{StaticResource MinimizeGeometry}" DockPanel.Dock="Right" diff --git a/src/PicView.Avalonia/PicViewTheme/Controls/Button.axaml b/src/PicView.Avalonia/PicViewTheme/Controls/Button.axaml index a963654f4..a04094c5b 100644 --- a/src/PicView.Avalonia/PicViewTheme/Controls/Button.axaml +++ b/src/PicView.Avalonia/PicViewTheme/Controls/Button.axaml @@ -1,6 +1,7 @@ + diff --git a/src/PicView.Avalonia/Views/UC/Buttons/AltClose.axaml b/src/PicView.Avalonia/Views/UC/Buttons/AltClose.axaml index 418067b10..9a1734e4b 100644 --- a/src/PicView.Avalonia/Views/UC/Buttons/AltClose.axaml +++ b/src/PicView.Avalonia/Views/UC/Buttons/AltClose.axaml @@ -14,6 +14,7 @@ Background="{DynamicResource AltBackgroundColor}" BorderThickness="1,0,0,1" Classes="ButtonBorder noBorderHover" + ClickMode="Release" Command="{CompiledBinding ExitCommand}" CornerRadius="0,0,0,0" DockPanel.Dock="Right" diff --git a/src/PicView.Avalonia/Views/UC/Buttons/AltMinimize.axaml b/src/PicView.Avalonia/Views/UC/Buttons/AltMinimize.axaml index 339e1f7b6..04031bfe5 100644 --- a/src/PicView.Avalonia/Views/UC/Buttons/AltMinimize.axaml +++ b/src/PicView.Avalonia/Views/UC/Buttons/AltMinimize.axaml @@ -15,6 +15,7 @@ BorderBrush="{DynamicResource MainBorderColor}" BorderThickness="1,0,0,0" Classes="ButtonBorder noBorderHover" + ClickMode="Release" Command="{CompiledBinding MinimizeCommand}" CornerRadius="0,0,0,10" DockPanel.Dock="Right" diff --git a/src/PicView.Avalonia/Views/UC/Buttons/AltRestore.axaml b/src/PicView.Avalonia/Views/UC/Buttons/AltRestore.axaml index 4d42b06b7..d233fba73 100644 --- a/src/PicView.Avalonia/Views/UC/Buttons/AltRestore.axaml +++ b/src/PicView.Avalonia/Views/UC/Buttons/AltRestore.axaml @@ -15,6 +15,7 @@ BorderBrush="{DynamicResource MainBorderColor}" BorderThickness="1,0,0,1" Classes="ButtonBorder noBorderHover" + ClickMode="Release" Command="{CompiledBinding ToggleFullscreenCommand}" CornerRadius="0,0,0,0" DockPanel.Dock="Right" diff --git a/src/PicView.Avalonia/Views/UC/Buttons/StarOutlineButtons.axaml b/src/PicView.Avalonia/Views/UC/Buttons/StarOutlineButtons.axaml index 312c2d3bd..91c91b2bd 100644 --- a/src/PicView.Avalonia/Views/UC/Buttons/StarOutlineButtons.axaml +++ b/src/PicView.Avalonia/Views/UC/Buttons/StarOutlineButtons.axaml @@ -40,6 +40,7 @@ Canvas.Left="3" Canvas.Top="3" Click="TwoStarCLick" + ClickMode="Release" Command="{Binding SetExifRating2Command}" Icon="{StaticResource StarOutlineDrawingImage}" IconHeight="20" @@ -55,6 +56,7 @@ Canvas.Left="3" Canvas.Top="3" Click="ThreeStarCLick" + ClickMode="Release" Command="{Binding SetExifRating3Command}" Icon="{StaticResource StarOutlineDrawingImage}" IconHeight="20" @@ -70,6 +72,7 @@ Canvas.Left="3" Canvas.Top="3" Click="FourStarCLick" + ClickMode="Release" Command="{Binding SetExifRating4Command}" Icon="{StaticResource StarOutlineDrawingImage}" IconHeight="20" @@ -85,6 +88,7 @@ Canvas.Left="3" Canvas.Top="3" Click="FiveStarCLick" + ClickMode="Release" Command="{Binding SetExifRating5Command}" Icon="{StaticResource StarOutlineDrawingImage}" IconHeight="20" diff --git a/src/PicView.Avalonia/Views/UC/Menus/FileMenu.axaml b/src/PicView.Avalonia/Views/UC/Menus/FileMenu.axaml index 7fc58f2f1..d856716de 100644 --- a/src/PicView.Avalonia/Views/UC/Menus/FileMenu.axaml +++ b/src/PicView.Avalonia/Views/UC/Menus/FileMenu.axaml @@ -118,6 +118,7 @@