zhaoyushun1999/Semi.Avalonia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix disable foreground.

Browse Source
This commit is contained in:
rabbitism 2024-03-22 20:15:32 +08:00
parent 90fbd2a7e5
commit 4782dab745
No known key found for this signature in database
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
View File

@ -42,7 +42,7 @@
<Button Classes="Success">Success</Button> <Button Classes="Success">Success</Button>
<Button Classes="Warning">Warning</Button> <Button Classes="Warning">Warning</Button>
<Button Classes="Danger">Danger</Button> <Button Classes="Danger">Danger</Button>
<Button Classes="Danger" IsEnabled="False">Danger</Button> <Button Classes="Danger" IsEnabled="False">Disabled</Button>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Spacing="20"> <StackPanel Orientation="Horizontal" Spacing="20">
<Button Classes="Primary Small">Small</Button> <Button Classes="Primary Small">Small</Button>
@ -56,7 +56,7 @@
<Button Classes="Tertiary" Theme="{DynamicResource SolidButton}">Tertiary</Button> <Button Classes="Tertiary" Theme="{DynamicResource SolidButton}">Tertiary</Button>
<Button Classes="Success" Theme="{DynamicResource SolidButton}">Success</Button> <Button Classes="Success" Theme="{DynamicResource SolidButton}">Success</Button>
<Button Classes="Warning" Theme="{DynamicResource SolidButton}">Warning</Button> <Button Classes="Warning" Theme="{DynamicResource SolidButton}">Warning</Button>
<Button Classes="Danger" Theme="{DynamicResource SolidButton}">Danger</Button> <Button Classes="Danger" Theme="{DynamicResource SolidButton}">Disabled</Button>
<Button <Button
Classes="Danger" Classes="Danger"
IsEnabled="False" IsEnabled="False"
@ -71,7 +71,7 @@
<Button Classes="Tertiary" Theme="{DynamicResource BorderlessButton}">Tertiary</Button> <Button Classes="Tertiary" Theme="{DynamicResource BorderlessButton}">Tertiary</Button>
<Button Classes="Success" Theme="{DynamicResource BorderlessButton}">Success</Button> <Button Classes="Success" Theme="{DynamicResource BorderlessButton}">Success</Button>
<Button Classes="Warning" Theme="{DynamicResource BorderlessButton}">Warning</Button> <Button Classes="Warning" Theme="{DynamicResource BorderlessButton}">Warning</Button>
<Button Classes="Danger" Theme="{DynamicResource BorderlessButton}">Danger</Button> <Button Classes="Danger" Theme="{DynamicResource BorderlessButton}">Disabled</Button>
<Button <Button
Classes="Danger" Classes="Danger"
IsEnabled="False" IsEnabled="False"
@ -115,7 +115,7 @@
<SplitButton Classes="Success" Content="Success" /> <SplitButton Classes="Success" Content="Success" />
<SplitButton Classes="Warning" Content="Warning" /> <SplitButton Classes="Warning" Content="Warning" />
<SplitButton Classes="Danger" Content="Danger" /> <SplitButton Classes="Danger" Content="Danger" />
<SplitButton Classes="Danger" Content="Danger" IsEnabled="False" /> <SplitButton Classes="Danger" Content="Disabled" IsEnabled="False" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Spacing="8"> <StackPanel Orientation="Horizontal" Spacing="8">
<SplitButton Content="Default" Classes="Success" /> <SplitButton Content="Default" Classes="Success" />
@ -123,7 +123,7 @@
<SplitButton Theme="{DynamicResource BorderlessSplitButton}" Content="Borderless" Classes="Success" /> <SplitButton Theme="{DynamicResource BorderlessSplitButton}" Content="Borderless" Classes="Success" />
<SplitButton Content="Default" Classes="Success" IsEnabled="False" /> <SplitButton Content="Default" Classes="Success" IsEnabled="False" />
<SplitButton Theme="{DynamicResource SolidSplitButton}" Content="Solid" Classes="Success" IsEnabled="False" /> <SplitButton Theme="{DynamicResource SolidSplitButton}" Content="Solid" Classes="Success" IsEnabled="False" />
<SplitButton Theme="{DynamicResource BorderlessSplitButton}" Content="Borderless" Classes="Success" IsEnabled="False" /> <SplitButton Theme="{DynamicResource BorderlessSplitButton}" Content="Disabled" Classes="Success" IsEnabled="False" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Spacing="8"> <StackPanel Orientation="Horizontal" Spacing="8">
<SplitButton Classes="Small" Content="Small" /> <SplitButton Classes="Small" Content="Small" />
@ -138,7 +138,7 @@
<ToggleSplitButton Classes="Success" Content="Success" /> <ToggleSplitButton Classes="Success" Content="Success" />
<ToggleSplitButton Classes="Warning" Content="Warning" /> <ToggleSplitButton Classes="Warning" Content="Warning" />
<ToggleSplitButton Classes="Danger" Content="Danger" /> <ToggleSplitButton Classes="Danger" Content="Danger" />
<ToggleSplitButton Classes="Danger" Content="Danger" IsEnabled="False" /> <ToggleSplitButton Classes="Danger" Content="Disabled" IsEnabled="False" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Spacing="8"> <StackPanel Orientation="Horizontal" Spacing="8">
<ToggleSplitButton Classes="Small" Content="Small" /> <ToggleSplitButton Classes="Small" Content="Small" />

3
src/Semi.Avalonia/Controls/DropDownButton.axaml
View File

@ -234,6 +234,9 @@
<Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
<Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" /> <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
</Style> </Style>
<Style Selector="^:disabled">
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
</Style>
</ControlTheme> </ControlTheme>
<ControlTheme <ControlTheme