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

Merge pull request #80 from irihitech/fix

Browse Source 
Fix: Fix various issues
This commit is contained in:
Zhang Dian 2023-02-11 00:29:51 +08:00 committed by GitHub
commit 922afa904b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
49 changed files with 446 additions and 296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml
View File

@ -11,10 +11,7 @@
<Design.DataContext> <Design.DataContext>
<local:AutoCompleteBoxDemoViewModel /> <local:AutoCompleteBoxDemoViewModel />
</Design.DataContext> </Design.DataContext>
<StackPanel <StackPanel HorizontalAlignment="Left" Spacing="20">
Margin="20"
HorizontalAlignment="Left"
Spacing="20">
<StackPanel.Styles> <StackPanel.Styles>
<Style Selector="AutoCompleteBox"> <Style Selector="AutoCompleteBox">
<Setter Property="Width" Value="300" /> <Setter Property="Width" Value="300" />

14
demo/Semi.Avalonia.Demo/Pages/BorderDemo.axaml
View File

@ -1,9 +1,13 @@
<UserControl <UserControl
x:Class="Semi.Avalonia.Demo.Pages.BorderDemo" xmlns="https://github.com/avaloniaui" x:Class="Semi.Avalonia.Demo.Pages.BorderDemo"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns="https://github.com/avaloniaui"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" d:DesignHeight="450" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
d:DesignWidth="800" mc:Ignorable="d"> xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
<StackPanel Margin="20" Spacing="20"> xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450"
d:DesignWidth="800"
mc:Ignorable="d">
<StackPanel Spacing="20">
<Border Theme="{StaticResource CardBorder}"> <Border Theme="{StaticResource CardBorder}">
<TextBlock>Card</TextBlock> <TextBlock>Card</TextBlock>
</Border> </Border>

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

@ -7,10 +7,7 @@
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel <StackPanel HorizontalAlignment="Left" Spacing="20">
Margin="20"
HorizontalAlignment="Left"
Spacing="20">
<TextBlock>Light (Default)</TextBlock> <TextBlock>Light (Default)</TextBlock>
<StackPanel Orientation="Horizontal" Spacing="20"> <StackPanel Orientation="Horizontal" Spacing="20">
<Button Classes="Primary">Primary</Button> <Button Classes="Primary">Primary</Button>
@ -49,7 +46,7 @@
</Button> </Button>
</StackPanel> </StackPanel>
<TextBlock>DropdownButton</TextBlock> <TextBlock>DropdownButton</TextBlock>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal" Spacing="8">
<DropDownButton Content="Submit"> <DropDownButton Content="Submit">
<DropDownButton.Flyout> <DropDownButton.Flyout>
<MenuFlyout Placement="BottomEdgeAlignedRight"> <MenuFlyout Placement="BottomEdgeAlignedRight">
@ -75,7 +72,7 @@
</DropDownButton.Flyout> </DropDownButton.Flyout>
</DropDownButton> </DropDownButton>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal" Spacing="8">
<SplitButton Content="Submit"> <SplitButton Content="Submit">
<SplitButton.Flyout> <SplitButton.Flyout>
<MenuFlyout Placement="BottomEdgeAlignedRight"> <MenuFlyout Placement="BottomEdgeAlignedRight">
@ -93,7 +90,7 @@
Content="Submit" Content="Submit"
IsEnabled="False" /> IsEnabled="False" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal" Spacing="8">
<ToggleSplitButton Content="Submit"> <ToggleSplitButton Content="Submit">
<ToggleSplitButton.Flyout> <ToggleSplitButton.Flyout>
<MenuFlyout Placement="BottomEdgeAlignedRight"> <MenuFlyout Placement="BottomEdgeAlignedRight">

5
demo/Semi.Avalonia.Demo/Pages/ButtonSpinnerDemo.axaml
View File

@ -7,10 +7,7 @@
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel <StackPanel HorizontalAlignment="Left" Spacing="20">
Margin="20"
HorizontalAlignment="Left"
Spacing="20">
<ButtonSpinner <ButtonSpinner
Height="30" Height="30"
AllowSpin="{Binding #allowSpinCheck.IsChecked}" AllowSpin="{Binding #allowSpinCheck.IsChecked}"

2
demo/Semi.Avalonia.Demo/Pages/CalendarDatePickerDemo.axaml
View File

@ -7,7 +7,7 @@
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel Margin="20" Spacing="20"> <StackPanel HorizontalAlignment="Left" Spacing="20">
<CalendarDatePicker /> <CalendarDatePicker />
<CalendarDatePicker <CalendarDatePicker
Name="DatePicker2" Name="DatePicker2"

5
demo/Semi.Avalonia.Demo/Pages/CalendarDatePickerDemo.axaml.cs
View File

@ -10,9 +10,4 @@ public partial class CalendarDatePickerDemo : UserControl
{ {
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

2
demo/Semi.Avalonia.Demo/Pages/CalendarDemo.axaml
View File

@ -7,7 +7,7 @@
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel Margin="20" Spacing="20"> <StackPanel HorizontalAlignment="Left" Spacing="20">
<Calendar /> <Calendar />
<Calendar SelectionMode="SingleRange" /> <Calendar SelectionMode="SingleRange" />
</StackPanel> </StackPanel>

2
demo/Semi.Avalonia.Demo/Pages/CheckBoxDemo.axaml
View File

@ -7,7 +7,7 @@
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel Margin="48" HorizontalAlignment="Left"> <StackPanel Spacing="20">
<CheckBox>Unchecked</CheckBox> <CheckBox>Unchecked</CheckBox>
<CheckBox IsEnabled="False">Unchecked</CheckBox> <CheckBox IsEnabled="False">Unchecked</CheckBox>
<CheckBox IsChecked="True">Checked</CheckBox> <CheckBox IsChecked="True">Checked</CheckBox>

2
demo/Semi.Avalonia.Demo/Pages/ColorPickerDemo.axaml
View File

@ -8,7 +8,7 @@
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel> <StackPanel Spacing="20">
<StackPanel <StackPanel
VerticalAlignment="Top" VerticalAlignment="Top"
Orientation="Horizontal" Orientation="Horizontal"

20
demo/Semi.Avalonia.Demo/Pages/ComboBoxDemo.axaml
View File

@ -7,21 +7,21 @@
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel Margin="20" Spacing="20"> <StackPanel Spacing="20">
<ComboBox Width="150"> <ComboBox Width="150">
<TextBlock>AAA</TextBlock> <ComboBoxItem>AAA</ComboBoxItem>
<TextBlock>BBB</TextBlock> <ComboBoxItem>BBB</ComboBoxItem>
<TextBlock>CCC</TextBlock> <ComboBoxItem>CCC</ComboBoxItem>
</ComboBox> </ComboBox>
<ComboBox Width="150" PlaceholderText="Please Select"> <ComboBox Width="150" PlaceholderText="Please Select">
<TextBlock>AAA</TextBlock> <ComboBoxItem>AAA</ComboBoxItem>
<TextBlock>BBB</TextBlock> <ComboBoxItem>BBB</ComboBoxItem>
<TextBlock>CCC</TextBlock> <ComboBoxItem>CCC</ComboBoxItem>
</ComboBox> </ComboBox>
<ComboBox Width="150" IsEnabled="False"> <ComboBox Width="150" IsEnabled="False">
<TextBlock>AAA</TextBlock> <ComboBoxItem>AAA</ComboBoxItem>
<TextBlock>BBB</TextBlock> <ComboBoxItem>BBB</ComboBoxItem>
<TextBlock>CCC</TextBlock> <ComboBoxItem>CCC</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
</UserControl> </UserControl>

5
demo/Semi.Avalonia.Demo/Pages/ComboBoxDemo.axaml.cs
View File

@ -10,9 +10,4 @@ public partial class ComboBoxDemo : UserControl
{ {
InitializeComponent(); InitializeComponent();
} }
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
} }

2
demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml
View File

@ -8,7 +8,7 @@
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<TabControl Grid.Row="2"> <TabControl>
<TabItem Header="DataGrid"> <TabItem Header="DataGrid">
<DockPanel> <DockPanel>
<CheckBox <CheckBox

2
demo/Semi.Avalonia.Demo/Pages/DatePickerDemo.axaml
View File

@ -7,7 +7,7 @@
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel Margin="20" Spacing="20"> <StackPanel Spacing="20">
<DatePicker /> <DatePicker />
<DatePicker DayFormat="d (ddd)" YearVisible="False" /> <DatePicker DayFormat="d (ddd)" YearVisible="False" />
<DatePicker IsEnabled="False" /> <DatePicker IsEnabled="False" />

23
demo/Semi.Avalonia.Demo/Pages/ExpanderDemo.axaml
View File

@ -1,9 +1,13 @@
<UserControl <UserControl
x:Class="Semi.Avalonia.Demo.Pages.ExpanderDemo" xmlns="https://github.com/avaloniaui" x:Class="Semi.Avalonia.Demo.Pages.ExpanderDemo"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns="https://github.com/avaloniaui"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" d:DesignHeight="450" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
d:DesignWidth="800" mc:Ignorable="d"> xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
<StackPanel Margin="20" Spacing="20"> xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450"
d:DesignWidth="800"
mc:Ignorable="d">
<StackPanel Spacing="20">
<StackPanel> <StackPanel>
<Expander Header="Expander 1"> <Expander Header="Expander 1">
<TextBlock Text="Hello Avalonia!" /> <TextBlock Text="Hello Avalonia!" />
@ -17,13 +21,16 @@
</StackPanel> </StackPanel>
<Grid ColumnDefinitions="* *"> <Grid ColumnDefinitions="* *">
<Expander <Expander
Height="200" ExpandDirection="Right" Height="200"
ExpandDirection="Right"
Header="Right"> Header="Right">
<TextBlock>Right Content</TextBlock> <TextBlock>Right Content</TextBlock>
</Expander> </Expander>
<Expander <Expander
Grid.Column="1" Height="200" Grid.Column="1"
HorizontalAlignment="Right" ExpandDirection="Left" Height="200"
HorizontalAlignment="Right"
ExpandDirection="Left"
Header="Left"> Header="Left">
<TextBlock>Left Content</TextBlock> <TextBlock>Left Content</TextBlock>
</Expander> </Expander>

17
demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml
View File

@ -1,11 +1,16 @@
<UserControl <UserControl
x:Class="Semi.Avalonia.Demo.Pages.LabelDemo" xmlns="https://github.com/avaloniaui" x:Class="Semi.Avalonia.Demo.Pages.LabelDemo"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns="https://github.com/avaloniaui"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" d:DesignHeight="450" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
d:DesignWidth="800" mc:Ignorable="d"> xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450"
d:DesignWidth="800"
mc:Ignorable="d">
<StackPanel <StackPanel
Width="500" Margin="20" Width="500"
HorizontalAlignment="Left" Spacing="20"> HorizontalAlignment="Left"
Spacing="20">
<StackPanel.Styles> <StackPanel.Styles>
<Style Selector="Label"> <Style Selector="Label">
<Setter Property="Margin" Value="4" /> <Setter Property="Margin" Value="4" />

2
demo/Semi.Avalonia.Demo/Pages/ListBoxDemo.axaml
View File

@ -7,7 +7,7 @@
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<ListBox Margin="20"> <ListBox>
<ListBoxItem>Item 1</ListBoxItem> <ListBoxItem>Item 1</ListBoxItem>
<ListBoxItem>Item 2</ListBoxItem> <ListBoxItem>Item 2</ListBoxItem>
<ListBoxItem IsEnabled="False">Item 3</ListBoxItem> <ListBoxItem IsEnabled="False">Item 3</ListBoxItem>

8
demo/Semi.Avalonia.Demo/Pages/MenuDemo.axaml
View File

@ -7,7 +7,7 @@
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel Margin="20" Spacing="20"> <StackPanel Spacing="20">
<Menu> <Menu>
<MenuItem Header="_First"> <MenuItem Header="_First">
<MenuItem Header="Standard _Menu Item" InputGesture="Ctrl+A" /> <MenuItem Header="Standard _Menu Item" InputGesture="Ctrl+A" />
@ -89,6 +89,7 @@
<MenuItem Header="Menu Item with _Checkbox"> <MenuItem Header="Menu Item with _Checkbox">
<MenuItem.Icon> <MenuItem.Icon>
<CheckBox <CheckBox
Padding="0"
BorderThickness="0" BorderThickness="0"
IsChecked="True" IsChecked="True"
IsHitTestVisible="False" /> IsHitTestVisible="False" />
@ -97,7 +98,7 @@
<MenuItem Header="Menu Item that won't close on click" StaysOpenOnClick="True" /> <MenuItem Header="Menu Item that won't close on click" StaysOpenOnClick="True" />
</ContextMenu> </ContextMenu>
</Border.ContextMenu> </Border.ContextMenu>
<TextBlock Text="Context Menu" /> <TextBlock Text="Right Click to show Context Menu" />
</Border> </Border>
<Border> <Border>
<Border.ContextFlyout> <Border.ContextFlyout>
@ -115,6 +116,7 @@
<MenuItem Header="Menu Item with _Checkbox"> <MenuItem Header="Menu Item with _Checkbox">
<MenuItem.Icon> <MenuItem.Icon>
<CheckBox <CheckBox
Padding="0"
BorderThickness="0" BorderThickness="0"
IsChecked="True" IsChecked="True"
IsHitTestVisible="False" /> IsHitTestVisible="False" />
@ -122,7 +124,7 @@
</MenuItem> </MenuItem>
</MenuFlyout> </MenuFlyout>
</Border.ContextFlyout> </Border.ContextFlyout>
<TextBlock Text="Context Flyout" /> <TextBlock Text="Right Click to show Context Flyout" />
</Border> </Border>
</StackPanel> </StackPanel>
</UserControl> </UserControl>

5
demo/Semi.Avalonia.Demo/Pages/NotificationDemo.axaml
View File

@ -7,10 +7,7 @@
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel <StackPanel HorizontalAlignment="Left" Spacing="20">
Margin="300,20,20,20"
HorizontalAlignment="Left"
Spacing="20">
<Button Click="InfoButton_OnClick" Content="Information" /> <Button Click="InfoButton_OnClick" Content="Information" />
<Button Click="InfoButton_OnClick" Content="Success" /> <Button Click="InfoButton_OnClick" Content="Success" />
<Button Click="InfoButton_OnClick" Content="Warning" /> <Button Click="InfoButton_OnClick" Content="Warning" />

5
demo/Semi.Avalonia.Demo/Pages/NumericUpDownDemo.axaml
View File

@ -7,10 +7,7 @@
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel <StackPanel HorizontalAlignment="Left" Spacing="20">
Margin="20"
HorizontalAlignment="Left"
Spacing="20">
<NumericUpDown <NumericUpDown
Width="200" Width="200"
Maximum="100" Maximum="100"

14
demo/Semi.Avalonia.Demo/Pages/Overview.axaml
View File

@ -8,19 +8,7 @@
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<ScrollViewer HorizontalScrollBarVisibility="Auto"> <ScrollViewer HorizontalScrollBarVisibility="Auto">
<StackPanel Margin="10" Spacing="5"> <StackPanel Spacing="5">
<TextBlock
HorizontalAlignment="Center"
Classes="H4"
Text="Welcome to Semi Avalonia"
Theme="{StaticResource TitleTextBlock}" />
<ToggleSwitch
Content="Switch Theme"
IsCheckedChanged="ToggleButton_OnIsCheckedChanged"
OffContent="Dark"
OnContent="Default" />
<StackPanel Orientation="Horizontal" Spacing="20"> <StackPanel Orientation="Horizontal" Spacing="20">
<Button Classes="Primary" Theme="{DynamicResource SolidButton}">Primary</Button> <Button Classes="Primary" Theme="{DynamicResource SolidButton}">Primary</Button>
<Button Classes="Secondary" Theme="{DynamicResource SolidButton}">Secondary</Button> <Button Classes="Secondary" Theme="{DynamicResource SolidButton}">Secondary</Button>

5
demo/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml
View File

@ -7,10 +7,7 @@
d:DesignHeight="800" d:DesignHeight="800"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel <StackPanel HorizontalAlignment="Left" Spacing="20">
Margin="20"
HorizontalAlignment="Left"
Spacing="20">
<ProgressBar <ProgressBar
Width="200" Width="200"
Maximum="100" Maximum="100"

13
demo/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml
View File

@ -1,10 +1,11 @@
<UserControl <UserControl
x:Class="Semi.Avalonia.Demo.Pages.RadioButtonDemo" xmlns="https://github.com/avaloniaui" x:Class="Semi.Avalonia.Demo.Pages.RadioButtonDemo"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns="https://github.com/avaloniaui"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"> xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
<StackPanel xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
Margin="20" HorizontalAlignment="Left" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Spacing="20"> mc:Ignorable="d">
<StackPanel HorizontalAlignment="Left" Spacing="20">
<TextBlock Text="Radio Buttons" /> <TextBlock Text="Radio Buttons" />
<StackPanel> <StackPanel>
<RadioButton>111</RadioButton> <RadioButton>111</RadioButton>

5
demo/Semi.Avalonia.Demo/Pages/RefreshContainerDemo.axaml
View File

@ -7,10 +7,7 @@
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel <StackPanel HorizontalAlignment="Left" Spacing="20">
Margin="20"
HorizontalAlignment="Left"
Spacing="20">
<RefreshContainer Name="container"> <RefreshContainer Name="container">
<TextBlock Text="Content" /> <TextBlock Text="Content" />
</RefreshContainer> </RefreshContainer>

32
demo/Semi.Avalonia.Demo/Pages/RepeatButtonDemo.axaml
View File

@ -1,11 +1,13 @@
<UserControl xmlns="https://github.com/avaloniaui" <UserControl
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Class="Semi.Avalonia.Demo.Pages.RepeatButtonDemo"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns="https://github.com/avaloniaui"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
mc:Ignorable="d" d:DesignWidth="800" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
d:DesignHeight="450" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
x:Class="Semi.Avalonia.Demo.Pages.RepeatButtonDemo"> d:DesignHeight="450"
<StackPanel Margin="20" HorizontalAlignment="Left" Spacing="20"> d:DesignWidth="800"
mc:Ignorable="d">
<StackPanel HorizontalAlignment="Left" Spacing="20">
<TextBlock>Light (Default)</TextBlock> <TextBlock>Light (Default)</TextBlock>
<StackPanel Orientation="Horizontal" Spacing="20"> <StackPanel Orientation="Horizontal" Spacing="20">
<RepeatButton Classes="Primary">Primary</RepeatButton> <RepeatButton Classes="Primary">Primary</RepeatButton>
@ -22,7 +24,12 @@
<RepeatButton Classes="Tertiary" Theme="{DynamicResource SolidRepeatButton}">Tertiary</RepeatButton> <RepeatButton Classes="Tertiary" Theme="{DynamicResource SolidRepeatButton}">Tertiary</RepeatButton>
<RepeatButton Classes="Warning" Theme="{DynamicResource SolidRepeatButton}">Warning</RepeatButton> <RepeatButton Classes="Warning" Theme="{DynamicResource SolidRepeatButton}">Warning</RepeatButton>
<RepeatButton Classes="Danger" Theme="{DynamicResource SolidRepeatButton}">Danger</RepeatButton> <RepeatButton Classes="Danger" Theme="{DynamicResource SolidRepeatButton}">Danger</RepeatButton>
<RepeatButton Classes="Primary" IsEnabled="False" Theme="{DynamicResource SolidRepeatButton}">Danger</RepeatButton> <RepeatButton
Classes="Primary"
IsEnabled="False"
Theme="{DynamicResource SolidRepeatButton}">
Danger
</RepeatButton>
</StackPanel> </StackPanel>
<TextBlock>Borderless</TextBlock> <TextBlock>Borderless</TextBlock>
<StackPanel Orientation="Horizontal" Spacing="20"> <StackPanel Orientation="Horizontal" Spacing="20">
@ -31,7 +38,12 @@
<RepeatButton Classes="Tertiary" Theme="{DynamicResource BorderlessRepeatButton}">Tertiary</RepeatButton> <RepeatButton Classes="Tertiary" Theme="{DynamicResource BorderlessRepeatButton}">Tertiary</RepeatButton>
<RepeatButton Classes="Warning" Theme="{DynamicResource BorderlessRepeatButton}">Warning</RepeatButton> <RepeatButton Classes="Warning" Theme="{DynamicResource BorderlessRepeatButton}">Warning</RepeatButton>
<RepeatButton Classes="Danger" Theme="{DynamicResource BorderlessRepeatButton}">Danger</RepeatButton> <RepeatButton Classes="Danger" Theme="{DynamicResource BorderlessRepeatButton}">Danger</RepeatButton>
<RepeatButton Classes="Primary" IsEnabled="False" Theme="{DynamicResource BorderlessRepeatButton}">Danger</RepeatButton> <RepeatButton
Classes="Primary"
IsEnabled="False"
Theme="{DynamicResource BorderlessRepeatButton}">
Danger
</RepeatButton>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</UserControl> </UserControl>

5
demo/Semi.Avalonia.Demo/Pages/SliderDemo.axaml
View File

@ -7,10 +7,7 @@
d:DesignHeight="800" d:DesignHeight="800"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel <StackPanel HorizontalAlignment="Left" Spacing="20">
Margin="20"
HorizontalAlignment="Left"
Spacing="20">
<Slider <Slider
Width="300" Width="300"
Maximum="100" Maximum="100"

1
demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml
View File

@ -11,7 +11,6 @@
<Grid ColumnDefinitions="*,400"> <Grid ColumnDefinitions="*,400">
<StackPanel <StackPanel
Grid.Column="1" Grid.Column="1"
Margin="5"
Orientation="Vertical" Orientation="Vertical"
Spacing="4"> Spacing="4">
<ToggleButton <ToggleButton

2
demo/Semi.Avalonia.Demo/Pages/TabControlDemo.axaml
View File

@ -7,7 +7,7 @@
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel> <StackPanel Spacing="20">
<Border Theme="{StaticResource CardBorder}"> <Border Theme="{StaticResource CardBorder}">
<TabControl TabStripPlacement="Top"> <TabControl TabStripPlacement="Top">
<TabItem Content="Hello 1" Header="Tab 1" /> <TabItem Content="Hello 1" Header="Tab 1" />

2
demo/Semi.Avalonia.Demo/Pages/TimePickerDemo.axaml
View File

@ -7,7 +7,7 @@
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel Margin="20" Spacing="20"> <StackPanel Spacing="20">
<TimePicker /> <TimePicker />
<TimePicker MinuteIncrement="15" /> <TimePicker MinuteIncrement="15" />
<TimePicker ClockIdentifier="24HourClock" /> <TimePicker ClockIdentifier="24HourClock" />

2
demo/Semi.Avalonia.Demo/Pages/ToggleButtonDemo.axaml
View File

@ -7,7 +7,7 @@
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel Margin="20"> <StackPanel>
<TextBlock Text="Toggle Button" /> <TextBlock Text="Toggle Button" />
<StackPanel Orientation="Horizontal" Spacing="20"> <StackPanel Orientation="Horizontal" Spacing="20">
<ToggleButton>Primary</ToggleButton> <ToggleButton>Primary</ToggleButton>

2
demo/Semi.Avalonia.Demo/Pages/ToggleSwitchDemo.axaml
View File

@ -7,7 +7,7 @@
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel Margin="20" Spacing="20"> <StackPanel Spacing="20">
<ToggleSwitch <ToggleSwitch
Content="Content" Content="Content"
OffContent="OffContent" OffContent="OffContent"

44
demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml Normal file
View File

@ -0,0 +1,44 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<ControlTheme x:Key="NavigationTab" TargetType="TabControl">
<Setter Property="TabControl.Template">
<!-- -->
<ControlTemplate TargetType="TabControl">
<Border
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
VerticalAlignment="{TemplateBinding VerticalAlignment}"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}">
<DockPanel>
<ScrollViewer DockPanel.Dock="Left" VerticalScrollBarVisibility="Auto">
<Panel DockPanel.Dock="{TemplateBinding TabStripPlacement}">
<ItemsPresenter Name="PART_ItemsPresenter">
<ItemsPresenter.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel />
</ItemsPanelTemplate>
</ItemsPresenter.ItemsPanel>
</ItemsPresenter>
<Border Name="PART_BorderSeparator" Background="{DynamicResource TabItemLinePipePressedBorderBrush}" />
</Panel>
</ScrollViewer>
<ContentPresenter
Name="PART_SelectedContentHost"
Margin="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding SelectedContent}"
ContentTemplate="{TemplateBinding SelectedContentTemplate}" />
</DockPanel>
</Border>
</ControlTemplate>
</Setter>
<Style Selector="^[TabStripPlacement=Left] /template/ Border#PART_BorderSeparator">
<Setter Property="Border.Width" Value="1" />
<Setter Property="Border.VerticalAlignment" Value="Stretch" />
<Setter Property="Border.HorizontalAlignment" Value="Left" />
</Style>
</ControlTheme>
</ResourceDictionary>

33
demo/Semi.Avalonia.Demo/Themes/ToggleButton.axaml Normal file
View File

@ -0,0 +1,33 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<ControlTheme x:Key="ThemeToggleButton" TargetType="ToggleButton">
<Setter Property="ToggleButton.Template">
<ControlTemplate TargetType="ToggleButton">
<Border
Name="Background"
Padding="8"
Background="{TemplateBinding Background}"
CornerRadius="3">
<PathIcon
Name="Icon"
Width="16"
Height="16"
Data="M3.55 19.09L4.96 20.5L6.76 18.71L5.34 17.29M12 6C8.69 6 6 8.69 6 12S8.69 18 12 18 18 15.31 18 12C18 8.68 15.31 6 12 6M20 13H23V11H20M17.24 18.71L19.04 20.5L20.45 19.09L18.66 17.29M20.45 5L19.04 3.6L17.24 5.39L18.66 6.81M13 1H11V4H13M6.76 5.39L4.96 3.6L3.55 5L5.34 6.81L6.76 5.39M1 13H4V11H1M13 20H11V23H13"
Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
</Border>
</ControlTemplate>
</Setter>
<Style Selector="^:pointerover">
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
</Style>
<Style Selector="^:pressed">
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
</Style>
<Style Selector="^:checked">
<Style Selector="^ /template/ PathIcon">
<Setter Property="PathIcon.Data" Value="M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17 15C17.476 15 17.9408 14.9525 18.3901 14.862C17.296 17.3011 14.8464 19 12 19C8.13401 19 5 15.866 5 12C5 8.60996 7.40983 5.78277 10.6099 5.13803C10.218 6.01173 10 6.98041 10 8C10 11.866 13.134 15 17 15Z" />
</Style>
</Style>
</ControlTheme>
</ResourceDictionary>

275
demo/Semi.Avalonia.Demo/Views/MainView.axaml
View File

@ -8,120 +8,163 @@
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<TabControl <UserControl.Resources>
Margin="8" <ResourceDictionary>
HorizontalAlignment="Stretch" <ResourceDictionary.MergedDictionaries>
TabStripPlacement="Left"> <ResourceInclude Source="../Themes/TabMenu.axaml" />
<TabItem Header="Overview"> <ResourceInclude Source="../Themes/ToggleButton.axaml" />
<pages:Overview /> </ResourceDictionary.MergedDictionaries>
</TabItem> </ResourceDictionary>
<TabItem Header="AutoCompleteBox"> </UserControl.Resources>
<pages:AutoCompleteBoxDemo /> <Grid RowDefinitions="Auto, *">
</TabItem> <Border
<TabItem Header="Border"> Margin="8"
<pages:BorderDemo /> Padding="12,4"
</TabItem> Theme="{DynamicResource CardBorder}">
<TabItem Header="Button"> <Grid VerticalAlignment="Center" ColumnDefinitions="*, Auto">
<pages:ButtonDemo /> <StackPanel Grid.Column="0" Orientation="Horizontal">
</TabItem> <TextBlock
<TabItem Header="ButtonSpinner"> VerticalAlignment="Center"
<pages:ButtonSpinnerDemo /> Classes="H6"
</TabItem> Text="Semi Avalonia"
<TabItem Header="Calendar"> Theme="{DynamicResource TitleTextBlock}" />
<pages:CalendarDemo /> <TextBlock
</TabItem> Margin="8,0"
<TabItem Header="CalendarDatePicker"> VerticalAlignment="Center"
<pages:CalendarDatePickerDemo /> Text="/" />
</TabItem> <TextBlock
<TabItem Header="Carousel"> Margin="8,0"
<pages:CarouselDemo /> VerticalAlignment="Center"
</TabItem> Classes="Secondary"
<TabItem Header="CheckBox"> Text="{Binding #tab.SelectedItem.Header}" />
<pages:CheckBoxDemo /> </StackPanel>
</TabItem> <ToggleButton
<TabItem Header="ColorPicker"> Grid.Column="1"
<pages:ColorPickerDemo /> IsCheckedChanged="ToggleButton_OnIsCheckedChanged"
</TabItem> Theme="{DynamicResource ThemeToggleButton}" />
<TabItem Header="ComboBox"> </Grid>
<pages:ComboBoxDemo />
</TabItem> </Border>
<TabItem Header="DataGrid"> <TabControl
<pages:DataGridDemo /> Name="tab"
</TabItem> Grid.Row="1"
<TabItem Header="DatePicker"> Margin="8"
<pages:DatePickerDemo /> Padding="20,0,0,0"
</TabItem> HorizontalAlignment="Stretch"
<TabItem Header="Expander"> TabStripPlacement="Left"
<pages:ExpanderDemo /> Theme="{DynamicResource NavigationTab}">
</TabItem> <TabItem Header="Overview">
<TabItem Header="Flyout"> <pages:Overview />
<pages:FlyoutDemo /> </TabItem>
</TabItem> <TabItem Header="AutoCompleteBox">
<TabItem Header="GridSplitter"> <pages:AutoCompleteBoxDemo />
<pages:GridSplitter /> </TabItem>
</TabItem> <TabItem Header="Border">
<TabItem Header="Label"> <pages:BorderDemo />
<pages:LabelDemo /> </TabItem>
</TabItem> <TabItem Header="Button">
<TabItem Header="ListBox"> <pages:ButtonDemo />
<pages:ListBoxDemo /> </TabItem>
</TabItem> <TabItem Header="ButtonSpinner">
<TabItem Header="ManagedFileChooser"> <pages:ButtonSpinnerDemo />
<pages:ManagedFileChooserDemo /> </TabItem>
</TabItem> <TabItem Header="Calendar">
<TabItem Header="Menu"> <pages:CalendarDemo />
<pages:MenuDemo /> </TabItem>
</TabItem> <TabItem Header="CalendarDatePicker">
<TabItem Header="Notification"> <pages:CalendarDatePickerDemo />
<pages:NotificationDemo /> </TabItem>
</TabItem> <TabItem Header="Carousel">
<TabItem Header="NumericUpDown"> <pages:CarouselDemo />
<pages:NumericUpDownDemo /> </TabItem>
</TabItem> <TabItem Header="CheckBox">
<TabItem Header="ProgressBar"> <pages:CheckBoxDemo />
<pages:ProgressBarDemo /> </TabItem>
</TabItem> <TabItem Header="ColorPicker">
<TabItem Header="RadioButton"> <pages:ColorPickerDemo />
<pages:RadioButtonDemo /> </TabItem>
</TabItem> <TabItem Header="ComboBox">
<TabItem Header="RefreshContainer"> <pages:ComboBoxDemo />
<pages:RefreshContainerDemo /> </TabItem>
</TabItem> <TabItem Header="DataGrid">
<TabItem Header="RepeatButton"> <pages:DataGridDemo />
<pages:RepeatButtonDemo /> </TabItem>
</TabItem> <TabItem Header="DatePicker">
<TabItem Header="Slider"> <pages:DatePickerDemo />
<pages:SliderDemo /> </TabItem>
</TabItem> <TabItem Header="Expander">
<TabItem Header="SplitView"> <pages:ExpanderDemo />
<pages:SplitViewDemo /> </TabItem>
</TabItem> <TabItem Header="Flyout">
<TabItem Header="TabControl"> <pages:FlyoutDemo />
<pages:TabControlDemo /> </TabItem>
</TabItem> <TabItem Header="GridSplitter">
<TabItem Header="TextBlock"> <pages:GridSplitter />
<pages:TextBlockDemo /> </TabItem>
</TabItem> <TabItem Header="Label">
<TabItem Header="TextBox"> <pages:LabelDemo />
<pages:TextBoxDemo /> </TabItem>
</TabItem> <TabItem Header="ListBox">
<TabItem Header="ThemeVariantScope"> <pages:ListBoxDemo />
<pages:ThemeVariantDemo /> </TabItem>
</TabItem> <TabItem Header="ManagedFileChooser">
<TabItem Header="TimePicker"> <pages:ManagedFileChooserDemo />
<pages:TimePickerDemo /> </TabItem>
</TabItem> <TabItem Header="Menu">
<TabItem Header="ToggleButton"> <pages:MenuDemo />
<pages:ToggleButtonDemo /> </TabItem>
</TabItem> <TabItem Header="Notification">
<TabItem Header="ToggleSwitch"> <pages:NotificationDemo />
<pages:ToggleSwitchDemo /> </TabItem>
</TabItem> <TabItem Header="NumericUpDown">
<TabItem Header="ToolTip"> <pages:NumericUpDownDemo />
<pages:ToolTipDemo /> </TabItem>
</TabItem> <TabItem Header="ProgressBar">
<TabItem Header="TreeView"> <pages:ProgressBarDemo />
<pages:TreeViewDemo /> </TabItem>
</TabItem> <TabItem Header="RadioButton">
</TabControl> <pages:RadioButtonDemo />
</TabItem>
<TabItem Header="RefreshContainer">
<pages:RefreshContainerDemo />
</TabItem>
<TabItem Header="RepeatButton">
<pages:RepeatButtonDemo />
</TabItem>
<TabItem Header="Slider">
<pages:SliderDemo />
</TabItem>
<TabItem Header="SplitView">
<pages:SplitViewDemo />
</TabItem>
<TabItem Header="TabControl">
<pages:TabControlDemo />
</TabItem>
<TabItem Header="TextBlock">
<pages:TextBlockDemo />
</TabItem>
<TabItem Header="TextBox">
<pages:TextBoxDemo />
</TabItem>
<TabItem Header="ThemeVariantScope">
<pages:ThemeVariantDemo />
</TabItem>
<TabItem Header="TimePicker">
<pages:TimePickerDemo />
</TabItem>
<TabItem Header="ToggleButton">
<pages:ToggleButtonDemo />
</TabItem>
<TabItem Header="ToggleSwitch">
<pages:ToggleSwitchDemo />
</TabItem>
<TabItem Header="ToolTip">
<pages:ToolTipDemo />
</TabItem>
<TabItem Header="TreeView">
<pages:TreeViewDemo />
</TabItem>
</TabControl>
</Grid>
</UserControl> </UserControl>

13
demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs
View File

@ -1,4 +1,7 @@
using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Interactivity;
using Avalonia.Styling;
namespace Semi.Avalonia.Demo.Views; namespace Semi.Avalonia.Demo.Views;
@ -8,4 +11,14 @@ public partial class MainView : UserControl
{ {
InitializeComponent(); InitializeComponent();
} }
private void ToggleButton_OnIsCheckedChanged(object sender, RoutedEventArgs e)
{
var app = Application.Current;
if (app is not null)
{
var theme = app.ActualThemeVariant;
app.RequestedThemeVariant = theme == ThemeVariant.Dark ? ThemeVariant.Light : ThemeVariant.Dark;
}
}
} }

6
src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
View File

@ -229,7 +229,11 @@
Tag="{TemplateBinding ColorModel}"> Tag="{TemplateBinding ColorModel}">
<Grid.Styles> <Grid.Styles>
<Style Selector="NumericUpDown /template/ TextBox"> <Style Selector="NumericUpDown /template/ TextBox">
<Setter Property="InnerLeftContent" Value="{TemplateBinding Tag}" /> <Setter Property="InnerLeftContent">
<Template>
<TextBlock Width="12" Text="{Binding $parent[NumericUpDown].Tag}" />
</Template>
</Setter>
</Style> </Style>
<Style Selector="Grid[Tag=Rgba]"> <Style Selector="Grid[Tag=Rgba]">
<Style Selector="^ NumericUpDown#Component1NumericUpDown"> <Style Selector="^ NumericUpDown#Component1NumericUpDown">

17
src/Semi.Avalonia.ColorPicker/Controls/ColorView.axaml
View File

@ -317,10 +317,15 @@
<Grid <Grid
Margin="12" Margin="12"
ColumnDefinitions="Auto,*" ColumnDefinitions="Auto,*"
RowDefinitions="Auto,24,1*,1*,1*,1*,12"> RowDefinitions="Auto,24,1*,1*,1*,1*,12"
UseLayoutRounding="False">
<Grid.Styles> <Grid.Styles>
<Style Selector="NumericUpDown /template/ TextBox"> <Style Selector="NumericUpDown /template/ TextBox">
<Setter Property="InnerLeftContent" Value="{TemplateBinding Tag}" /> <Setter Property="InnerLeftContent">
<Template>
<TextBlock Width="12" Text="{Binding $parent[NumericUpDown].Tag}" />
</Template>
</Setter>
</Style> </Style>
</Grid.Styles> </Grid.Styles>
<!-- Top color model & Hex input --> <!-- Top color model & Hex input -->
@ -386,13 +391,7 @@
Minimum="{Binding Minimum, ElementName=Component1Slider}" Minimum="{Binding Minimum, ElementName=Component1Slider}"
NumberFormat="{StaticResource ColorViewComponentNumberFormat}" NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
ShowButtonSpinner="False" ShowButtonSpinner="False"
Value="{Binding Value, ElementName=Component1Slider}"> Value="{Binding Value, ElementName=Component1Slider}" />
<NumericUpDown.Styles>
<Style Selector="NumericUpDown /template/ TextBox">
<Setter Property="InnerLeftContent" Value="{TemplateBinding Tag}" />
</Style>
</NumericUpDown.Styles>
</NumericUpDown>
<primitives:ColorSlider <primitives:ColorSlider
x:Name="Component1Slider" x:Name="Component1Slider"
Grid.Row="2" Grid.Row="2"

8
src/Semi.Avalonia.DataGrid/DataGrid.axaml
View File

@ -357,13 +357,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Background="Transparent" Background="Transparent"
Data="{DynamicResource DataGridRowGroupHeaderExpandIconGlyph}" Data="{DynamicResource DataGridRowGroupHeaderExpandIconGlyph}"
Foreground="{DynamicResource DataGridRowGroupHeaderExpandIconForeground}"> Foreground="{DynamicResource DataGridRowGroupHeaderExpandIconForeground}" />
<PathIcon.Transitions>
<Transitions>
<TransformOperationsTransition Property="RenderTransform" Duration="0.1" />
</Transitions>
</PathIcon.Transitions>
</PathIcon>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:checked /template/ PathIcon"> <Style Selector="^:checked /template/ PathIcon">

1
src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
View File

@ -8,6 +8,7 @@
<ControlTheme x:Key="{x:Type AutoCompleteBox}" TargetType="AutoCompleteBox"> <ControlTheme x:Key="{x:Type AutoCompleteBox}" TargetType="AutoCompleteBox">
<Setter Property="Background" Value="{DynamicResource AutoCompleteBoxDefaultBackground}" /> <Setter Property="Background" Value="{DynamicResource AutoCompleteBoxDefaultBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource AutoCompleteBoxDefaultBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource AutoCompleteBoxDefaultBorderBrush}" />
<Setter Property="CornerRadius" Value="{DynamicResource AutoCompleteBoxCornerRadius}" />
<Setter Property="AutoCompleteBox.MaxDropDownHeight" Value="600" /> <Setter Property="AutoCompleteBox.MaxDropDownHeight" Value="600" />
<Setter Property="BorderThickness" Value="1" /> <Setter Property="BorderThickness" Value="1" />
<Setter Property="Template"> <Setter Property="Template">

43
src/Semi.Avalonia/Controls/CheckBox.axaml
View File

@ -15,15 +15,18 @@
<ControlTemplate TargetType="CheckBox"> <ControlTemplate TargetType="CheckBox">
<Grid x:Name="RootGrid" ColumnDefinitions="Auto,*"> <Grid x:Name="RootGrid" ColumnDefinitions="Auto,*">
<Border <Border
x:Name="PART_Border" Grid.ColumnSpan="2" x:Name="PART_Border"
Grid.Column="0"
Grid.ColumnSpan="2"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}" /> CornerRadius="{TemplateBinding CornerRadius}" />
<Grid <Grid
Grid.Column="0" Margin="0,2,0,0" Grid.Column="0"
VerticalAlignment="Top"> Margin="0,0,0,0"
VerticalAlignment="Center">
<Border <Border
x:Name="NormalRectangle" x:Name="NormalRectangle"
Width="{DynamicResource CheckboxBoxWidth}" Width="{DynamicResource CheckboxBoxWidth}"
@ -33,25 +36,25 @@
BorderThickness="{DynamicResource CheckboxBoxBorderThickness}" BorderThickness="{DynamicResource CheckboxBoxBorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}" CornerRadius="{TemplateBinding CornerRadius}"
UseLayoutRounding="False" /> UseLayoutRounding="False" />
<PathIcon
Name="CheckGlyph"
Width="{DynamicResource CheckboxBoxGlyphWidth}"
Height="{DynamicResource CheckboxBoxGlyphHeight}"
Foreground="{DynamicResource CheckboxGlyphFill}" />
<Viewbox Height="{DynamicResource CheckboxBoxWidth}" UseLayoutRounding="False">
<Panel>
<Panel Width="{DynamicResource CheckboxBoxWidth}" Height="{DynamicResource CheckboxBoxWidth}" />
<Path
x:Name="CheckGlyph" VerticalAlignment="Center"
Fill="{DynamicResource CheckboxGlyphFill}"
Opacity="0" Stretch="Uniform" />
</Panel>
</Viewbox>
</Grid> </Grid>
<ContentPresenter <ContentPresenter
x:Name="ContentPresenter" Grid.Column="1" x:Name="ContentPresenter"
Grid.Column="1"
Margin="{TemplateBinding Padding}" Margin="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="Top" VerticalAlignment="Center"
Content="{TemplateBinding Content}" Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplate="{TemplateBinding ContentTemplate}"
RecognizesAccessKey="True" TextWrapping="Wrap" /> IsVisible="{TemplateBinding Content,
Converter={x:Static ObjectConverters.IsNotNull}}"
RecognizesAccessKey="True"
TextWrapping="Wrap" />
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
@ -89,9 +92,8 @@
<Setter Property="Background" Value="{DynamicResource CheckboxCheckedDefaultBackground}" /> <Setter Property="Background" Value="{DynamicResource CheckboxCheckedDefaultBackground}" />
</Style> </Style>
<Style Selector="^ /template/ Path#CheckGlyph"> <Style Selector="^ /template/ PathIcon#CheckGlyph">
<Setter Property="Data" Value="M17.4111 7.30848C18.0692 7.81171 18.1947 8.75312 17.6915 9.41119L11.1915 17.9112C10.909 18.2806 10.4711 18.4981 10.0061 18.5C9.54105 18.5019 9.10143 18.288 8.81592 17.9209L5.31592 13.4209C4.80731 12.767 4.92512 11.8246 5.57904 11.316C6.23296 10.8074 7.17537 10.9252 7.68398 11.5791L9.98988 14.5438L15.3084 7.58884C15.8116 6.93077 16.7531 6.80525 17.4111 7.30848Z" /> <Setter Property="Data" Value="{DynamicResource CheckBoxCheckGlyph}" />
<Setter Property="Width" Value="9" />
<Setter Property="Opacity" Value="1" /> <Setter Property="Opacity" Value="1" />
</Style> </Style>
@ -133,9 +135,8 @@
<Setter Property="Background" Value="{DynamicResource CheckboxCheckedDefaultBackground}" /> <Setter Property="Background" Value="{DynamicResource CheckboxCheckedDefaultBackground}" />
</Style> </Style>
<Style Selector="^ /template/ Path#CheckGlyph"> <Style Selector="^ /template/ PathIcon#CheckGlyph">
<Setter Property="Data" Value="M5 12.5C5 11.6716 5.67157 11 6.5 11H17.5C18.3284 11 19 11.6716 19 12.5C19 13.3284 18.3284 14 17.5 14H6.5C5.67157 14 5 13.3284 5 12.5Z" /> <Setter Property="Data" Value="{DynamicResource CheckBoxIndeterminateGlyph}" />
<Setter Property="Width" Value="9" />
<Setter Property="Opacity" Value="1" /> <Setter Property="Opacity" Value="1" />
</Style> </Style>

23
src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
View File

@ -23,6 +23,7 @@
<ControlTemplate TargetType="dialogs:ManagedFileChooser"> <ControlTemplate TargetType="dialogs:ManagedFileChooser">
<DockPanel> <DockPanel>
<Border <Border
Margin="8"
Padding="4" Padding="4"
DockPanel.Dock="Left" DockPanel.Dock="Left"
Theme="{DynamicResource CardBorder}"> Theme="{DynamicResource CardBorder}">
@ -47,7 +48,7 @@
</Border> </Border>
<DockPanel <DockPanel
x:Name="NavBar" x:Name="NavBar"
Margin="8,5,8,0" Margin="8,8,8,0"
VerticalAlignment="Center" VerticalAlignment="Center"
DockPanel.Dock="Top"> DockPanel.Dock="Top">
<Button <Button
@ -69,12 +70,12 @@
<DockPanel Margin="8,0,8,8" DockPanel.Dock="Bottom"> <DockPanel Margin="8,0,8,8" DockPanel.Dock="Bottom">
<DockPanel Margin="0,0,0,8" DockPanel.Dock="Top"> <DockPanel Margin="0,0,0,8" DockPanel.Dock="Top">
<ComboBox <ComboBox
Margin="8,0,0,0"
DockPanel.Dock="Right" DockPanel.Dock="Right"
IsVisible="{Binding ShowFilters}" IsVisible="{Binding ShowFilters}"
Items="{Binding Filters}" Items="{Binding Filters}"
SelectedItem="{Binding SelectedFilter}" /> SelectedItem="{Binding SelectedFilter}" />
<TextBox <TextBox
Margin="0,0,8,0"
IsVisible="{Binding !SelectingFolder}" IsVisible="{Binding !SelectingFolder}"
Text="{Binding FileName}" Text="{Binding FileName}"
Watermark="File name" /> Watermark="File name" />
@ -89,28 +90,32 @@
HorizontalAlignment="Right" HorizontalAlignment="Right"
Rows="1"> Rows="1">
<Button <Button
Margin="8,0" Margin="8,0,0,0"
Classes="Primary" Classes="Primary"
Command="{Binding Ok}"> Command="{Binding Ok}">
OK OK
</Button> </Button>
<Button <Button
Margin="8,0" Margin="8,0,0,0"
Classes="Danger" Classes="Danger"
Command="{Binding Cancel}"> Command="{Binding Cancel}">
Cancel Cancel
</Button> </Button>
</UniformGrid> </UniformGrid>
</DockPanel> </DockPanel>
<Border Padding="8" Theme="{DynamicResource CardBorder}"> <Border
Margin="8"
Padding="8"
Theme="{DynamicResource CardBorder}">
<DockPanel Grid.IsSharedSizeScope="True"> <DockPanel Grid.IsSharedSizeScope="True">
<Grid <Grid
Margin="0,0,0,8"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
ClipToBounds="True" ClipToBounds="True"
DockPanel.Dock="Top"> DockPanel.Dock="Top">
<Grid.Styles> <Grid.Styles>
<Style Selector="TextBlock"> <Style Selector="TextBlock">
<Setter Property="Height" Value="24" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="8 0 0 0 " /> <Setter Property="Margin" Value="8 0 0 0 " />
</Style> </Style>
</Grid.Styles> </Grid.Styles>
@ -134,7 +139,11 @@
<GridSplitter Grid.Column="7" Width="1" /> <GridSplitter Grid.Column="7" Width="1" />
<TextBlock Grid.Column="8" Text="Size" /> <TextBlock Grid.Column="8" Text="Size" />
</Grid> </Grid>
<ListBox Name="PART_Files" Items="{Binding Items}"> <ListBox
Name="PART_Files"
Items="{Binding Items}"
SelectedItems="{Binding SelectedItems}"
SelectionMode="{Binding SelectionMode}">
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<Grid Background="Transparent"> <Grid Background="Transparent">

12
src/Semi.Avalonia/Controls/Menu.axaml
View File

@ -132,15 +132,17 @@
<Viewbox <Viewbox
Name="PART_IconPresenter" Name="PART_IconPresenter"
Width="12" Width="16"
Height="12" Height="16"
Margin="{DynamicResource MenuItemIconMargin}" Margin="{DynamicResource MenuItemIconMargin}"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
IsVisible="False" IsVisible="False"
Stretch="UniformToFill" Stretch="Uniform">
StretchDirection="DownOnly"> <ContentPresenter
<ContentPresenter Content="{TemplateBinding Icon}" /> HorizontalAlignment="Center"
VerticalAlignment="Center"
Content="{TemplateBinding Icon}" />
</Viewbox> </Viewbox>
<ContentPresenter <ContentPresenter

2
src/Semi.Avalonia/Controls/SplitButton.axaml
View File

@ -46,7 +46,7 @@
x:Name="SeparatorBorder" x:Name="SeparatorBorder"
Grid.Column="1" Grid.Column="1"
Width="{DynamicResource SplitButtonSeparatorWidth}" Width="{DynamicResource SplitButtonSeparatorWidth}"
Background="White" Background="Transparent"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="0.5" /> BorderThickness="0.5" />

16
src/Semi.Avalonia/Controls/TextBox.axaml
View File

@ -48,15 +48,13 @@
<Setter Property="Button.Template"> <Setter Property="Button.Template">
<ControlTemplate TargetType="Button"> <ControlTemplate TargetType="Button">
<!-- Background must be transparent or hit test will fail --> <!-- Background must be transparent or hit test will fail -->
<Label Background="Transparent"> <ContentControl Background="Transparent">
<Label.Content> <PathIcon
<PathIcon Width="16"
Width="16" Height="16"
Height="16" Data="{DynamicResource TextBoxClearButtonData}"
Data="{DynamicResource TextBoxClearButtonData}" Foreground="{TemplateBinding Foreground}" />
Foreground="{TemplateBinding Foreground}" /> </ContentControl>
</Label.Content>
</Label>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:pointerover"> <Style Selector="^:pointerover">

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

@ -2,5 +2,8 @@
<!-- Add Resources Here --> <!-- Add Resources Here -->
<ControlTheme x:Key="{x:Type ThemeVariantScope}" TargetType="ThemeVariantScope"> <ControlTheme x:Key="{x:Type ThemeVariantScope}" TargetType="ThemeVariantScope">
<!-- Add Resources Here --> <!-- Add Resources Here -->
<Setter Property="TextElement.Foreground" Value="{DynamicResource DefaultForeground}" />
<Setter Property="TextElement.FontSize" Value="{DynamicResource DefaultFontSize}" />
<Setter Property="TextElement.FontFamily" Value="{DynamicResource DefaultFontFamily}" />
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

11
src/Semi.Avalonia/Themes/Base.axaml
View File

@ -1,7 +1,16 @@
<ResourceDictionary <ResourceDictionary
xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=System.Runtime"> xmlns:sys="clr-namespace:System;assembly=System.Runtime">
<!-- Add Resources Here --> <!-- Add Resources Here -->
<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Default">
<SolidColorBrush x:Key="DefaultForeground" Color="#1C1F23" />
</ResourceDictionary>
<ResourceDictionary x:Key="Dark">
<SolidColorBrush x:Key="DefaultForeground" Color="#F9F9F9" />
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
<sys:Double x:Key="DefaultFontSize">14</sys:Double> <sys:Double x:Key="DefaultFontSize">14</sys:Double>
<FontFamily x:Key="DefaultFontFamily">Inter, -apple-system,BlinkMacSystemFont,PingFang SC, Microsoft YaHei, Segoe UI, Hiragino Sans GB, Helvetica Neue,Helvetica,Arial,sans-serif</FontFamily> <FontFamily x:Key="DefaultFontFamily">Inter, -apple-system,BlinkMacSystemFont,PingFang SC, Microsoft YaHei, Segoe UI, Hiragino Sans GB, Helvetica Neue,Helvetica,Arial,sans-serif</FontFamily>
<FontFamily x:Key="CodeFontFamily">Cascadia Code, Consolas, Inconsolata, monospace</FontFamily> <FontFamily x:Key="CodeFontFamily">Cascadia Code, Consolas, Inconsolata, monospace</FontFamily>

1
src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
View File

@ -9,4 +9,5 @@
<CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius> <CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius>
<SolidColorBrush x:Key="AutoCompleteBoxBorderlessBorderBrush" Color="Transparent" /> <SolidColorBrush x:Key="AutoCompleteBoxBorderlessBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="AutoCompleteBoxBorderlessBackground" Opacity="0.05" Color="#E6E8EA" /> <SolidColorBrush x:Key="AutoCompleteBoxBorderlessBackground" Opacity="0.05" Color="#E6E8EA" />
<CornerRadius x:Key="AutoCompleteBoxCornerRadius">3</CornerRadius>
</ResourceDictionary> </ResourceDictionary>

5
src/Semi.Avalonia/Themes/Dark/CheckBox.axaml
View File

@ -30,9 +30,14 @@
<sys:Double x:Key="CheckboxFontSize">14</sys:Double> <sys:Double x:Key="CheckboxFontSize">14</sys:Double>
<sys:Double x:Key="CheckboxBoxWidth">16</sys:Double> <sys:Double x:Key="CheckboxBoxWidth">16</sys:Double>
<sys:Double x:Key="CheckboxBoxHeight">16</sys:Double> <sys:Double x:Key="CheckboxBoxHeight">16</sys:Double>
<sys:Double x:Key="CheckboxBoxGlyphWidth">12</sys:Double>
<sys:Double x:Key="CheckboxBoxGlyphHeight">12</sys:Double>
<FontWeight x:Key="CheckboxFontWeight">400</FontWeight> <FontWeight x:Key="CheckboxFontWeight">400</FontWeight>
<CornerRadius x:Key="CheckboxBoxCornerRadius">3</CornerRadius> <CornerRadius x:Key="CheckboxBoxCornerRadius">3</CornerRadius>
<Thickness x:Key="CheckboxContentMargin">8 0 0 0</Thickness> <Thickness x:Key="CheckboxContentMargin">8 0 0 0</Thickness>
<Thickness x:Key="CheckboxBoxBorderThickness">1</Thickness> <Thickness x:Key="CheckboxBoxBorderThickness">1</Thickness>
<PathGeometry x:Key="CheckBoxCheckGlyph">M17.4111 7.30848C18.0692 7.81171 18.1947 8.75312 17.6915 9.41119L11.1915 17.9112C10.909 18.2806 10.4711 18.4981 10.0061 18.5C9.54105 18.5019 9.10143 18.288 8.81592 17.9209L5.31592 13.4209C4.80731 12.767 4.92512 11.8246 5.57904 11.316C6.23296 10.8074 7.17537 10.9252 7.68398 11.5791L9.98988 14.5438L15.3084 7.58884C15.8116 6.93077 16.7531 6.80525 17.4111 7.30848Z</PathGeometry>
<PathGeometry x:Key="CheckBoxIndeterminateGlyph">M5 12.5C5 11.6716 5.67157 11 6.5 11H17.5C18.3284 11 19 11.6716 19 12.5C19 13.3284 18.3284 14 17.5 14H6.5C5.67157 14 5 13.3284 5 12.5Z</PathGeometry>
</ResourceDictionary> </ResourceDictionary>

1
src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
View File

@ -9,4 +9,5 @@
<CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius> <CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius>
<SolidColorBrush x:Key="AutoCompleteBoxBorderlessBorderBrush" Color="Transparent" /> <SolidColorBrush x:Key="AutoCompleteBoxBorderlessBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="AutoCompleteBoxBorderlessBackground" Opacity="0.05" Color="#2E3238" /> <SolidColorBrush x:Key="AutoCompleteBoxBorderlessBackground" Opacity="0.05" Color="#2E3238" />
<CornerRadius x:Key="AutoCompleteBoxCornerRadius">3</CornerRadius>
</ResourceDictionary> </ResourceDictionary>

8
src/Semi.Avalonia/Themes/Light/CheckBox.axaml
View File

@ -1,5 +1,6 @@
<ResourceDictionary <ResourceDictionary
xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=System.Runtime"> xmlns:sys="clr-namespace:System;assembly=System.Runtime">
<SolidColorBrush x:Key="CheckboxForeground" Color="#1C1F23" /> <SolidColorBrush x:Key="CheckboxForeground" Color="#1C1F23" />
<SolidColorBrush x:Key="CheckboxDisabledForeground" Opacity="0.35" Color="#1C1F23" /> <SolidColorBrush x:Key="CheckboxDisabledForeground" Opacity="0.35" Color="#1C1F23" />
@ -29,9 +30,14 @@
<sys:Double x:Key="CheckboxFontSize">14</sys:Double> <sys:Double x:Key="CheckboxFontSize">14</sys:Double>
<sys:Double x:Key="CheckboxBoxWidth">16</sys:Double> <sys:Double x:Key="CheckboxBoxWidth">16</sys:Double>
<sys:Double x:Key="CheckboxBoxHeight">16</sys:Double> <sys:Double x:Key="CheckboxBoxHeight">16</sys:Double>
<sys:Double x:Key="CheckboxBoxGlyphWidth">12</sys:Double>
<sys:Double x:Key="CheckboxBoxGlyphHeight">12</sys:Double>
<FontWeight x:Key="CheckboxFontWeight">400</FontWeight> <FontWeight x:Key="CheckboxFontWeight">400</FontWeight>
<CornerRadius x:Key="CheckboxBoxCornerRadius">3</CornerRadius> <CornerRadius x:Key="CheckboxBoxCornerRadius">3</CornerRadius>
<Thickness x:Key="CheckboxContentMargin">8 0 0 0</Thickness> <Thickness x:Key="CheckboxContentMargin">8 0 0 0</Thickness>
<Thickness x:Key="CheckboxBoxBorderThickness">1</Thickness> <Thickness x:Key="CheckboxBoxBorderThickness">1</Thickness>
<PathGeometry x:Key="CheckBoxCheckGlyph">M17.4111 7.30848C18.0692 7.81171 18.1947 8.75312 17.6915 9.41119L11.1915 17.9112C10.909 18.2806 10.4711 18.4981 10.0061 18.5C9.54105 18.5019 9.10143 18.288 8.81592 17.9209L5.31592 13.4209C4.80731 12.767 4.92512 11.8246 5.57904 11.316C6.23296 10.8074 7.17537 10.9252 7.68398 11.5791L9.98988 14.5438L15.3084 7.58884C15.8116 6.93077 16.7531 6.80525 17.4111 7.30848Z</PathGeometry>
<PathGeometry x:Key="CheckBoxIndeterminateGlyph">M5 12.5C5 11.6716 5.67157 11 6.5 11H17.5C18.3284 11 19 11.6716 19 12.5C19 13.3284 18.3284 14 17.5 14H6.5C5.67157 14 5 13.3284 5 12.5Z</PathGeometry>
</ResourceDictionary> </ResourceDictionary>