chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #658 from irihitech/various

Browse Source 
remove scale transform in Button &  simplify OnPlatform use case
This commit is contained in:
Dong Bin
2025-04-25 12:07:19 +08:00
committed by GitHub
parent 2241a0dd94 00345f5d34
commit aa561bb568
4 changed files with 6 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
demo/Ursa.Demo/Views/MainWindow.axaml
View File

@@ -15,8 +15,8 @@
x:DataType="viewModels:MainWindowViewModel" x:DataType="viewModels:MainWindowViewModel"
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
Icon="/Assets/Ursa.ico" Icon="/Assets/Ursa.ico"
IsFullScreenButtonVisible="{OnPlatform True, macOS=False}" IsFullScreenButtonVisible="{OnPlatform {x:True}, macOS={x:False}}"
IsManagedResizerVisible="{OnPlatform False, Linux=True}" IsManagedResizerVisible="{OnPlatform {x:False}, Linux={x:True}}"
mc:Ignorable="d"> mc:Ignorable="d">
<u:UrsaWindow.RightContent> <u:UrsaWindow.RightContent>
<views:TitleBarRightContent /> <views:TitleBarRightContent />

4
src/Ursa.Themes.Semi/Controls/IconButton.axaml
View File

@@ -86,10 +86,6 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:pressed">
<Setter Property="RenderTransform" Value="scale(0.98)" />
</Style>
<Style Selector="^.Primary"> <Style Selector="^.Primary">
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" /> <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
</Style> </Style>

6
src/Ursa.Themes.Semi/Controls/ScrollToButton.axaml
View File

@@ -23,9 +23,6 @@
</Border> </Border>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:pressed">
<Setter Property="RenderTransform" Value="scale(0.98)" />
</Style>
<Style Selector="^:pointerover /template/ Border#PART_Background"> <Style Selector="^:pointerover /template/ Border#PART_Background">
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" /> <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
@@ -66,9 +63,6 @@
</Border> </Border>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:pressed">
<Setter Property="RenderTransform" Value="scale(0.98)" />
</Style>
<Style Selector="^:pointerover /template/ Border#PART_Background"> <Style Selector="^:pointerover /template/ Border#PART_Background">
<Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" /> <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />

35
src/Ursa.Themes.Semi/Controls/UrsaWindow.axaml
View File

@@ -11,39 +11,12 @@
<Setter Property="ExtendClientAreaTitleBarHeightHint" Value="-1" /> <Setter Property="ExtendClientAreaTitleBarHeightHint" Value="-1" />
<Setter Property="ExtendClientAreaToDecorationsHint" Value="True" /> <Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />
<Setter Property="u:OverlayDialogHost.IsModalStatusScope" Value="True" /> <Setter Property="u:OverlayDialogHost.IsModalStatusScope" Value="True" />
<Setter Property="IsMinimizeButtonVisible"> <Setter Property="IsMinimizeButtonVisible" Value="{OnPlatform {x:True},macOS={x:False}}" />
<OnPlatform> <Setter Property="IsRestoreButtonVisible" Value="{OnPlatform {x:True},macOS={x:False}}" />
<On Options="Default, Windows, Linux"> <Setter Property="IsCloseButtonVisible" Value="{OnPlatform {x:True},macOS={x:False}}"/>
<x:Boolean>True</x:Boolean>
</On>
<On Options="macOS">
<x:Boolean>False</x:Boolean>
</On>
</OnPlatform>
</Setter>
<Setter Property="IsRestoreButtonVisible">
<OnPlatform>
<On Options="Default, Windows, Linux">
<x:Boolean>True</x:Boolean>
</On>
<On Options="macOS">
<x:Boolean>False</x:Boolean>
</On>
</OnPlatform>
</Setter>
<Setter Property="IsCloseButtonVisible">
<OnPlatform>
<On Options="Default, Windows, Linux">
<x:Boolean>True</x:Boolean>
</On>
<On Options="macOS">
<x:Boolean>False</x:Boolean>
</On>
</OnPlatform>
</Setter>
<Setter Property="SystemDecorations"> <Setter Property="SystemDecorations">
<OnPlatform> <OnPlatform>
<On Options="Default, Windows, macOS"> <On Options="Default">
<SystemDecorations>Full</SystemDecorations> <SystemDecorations>Full</SystemDecorations>
</On> </On>
<On Options="Linux"> <On Options="Linux">