Skip to content

Commit 0dda40d

Browse files
zdpcdtzdpcdt
authored
Merge pull request #672 from irihitech/split
ready for Avalonia 11.3.7
2 parents 7a13de0 + 37feb8a commit 0dda40d

File tree

10 files changed

+477
-299
lines changed

10 files changed

+477
-299
lines changed

‎demo/Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
3-
<AvaloniaVersion>11.3.0</AvaloniaVersion>
4-
<DataGridVersion>11.3.0</DataGridVersion>
3+
<AvaloniaVersion>11.3.7</AvaloniaVersion>
4+
<DataGridVersion>11.3.7</DataGridVersion>
55
<CommunityToolkitVersion>8.4.0</CommunityToolkitVersion>
66
</PropertyGroup>
77
</Project>

‎demo/Semi.Avalonia.Demo/Pages/ComboBoxDemo.axaml‎

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -12,42 +12,46 @@
1212
<Design.DataContext>
1313
<vm:ComboBoxDemoViewModel />
1414
</Design.DataContext>
15-
<StackPanel Spacing="20">
16-
<StackPanel.Styles>
17-
<Style Selector="ComboBox">
18-
<Setter Property="Width" Value="300" />
19-
<Setter Property="ItemsSource" Value="{Binding Items}" />
20-
</Style>
21-
</StackPanel.Styles>
15+
<ScrollViewer>
16+
<StackPanel Spacing="20">
17+
<StackPanel.Styles>
18+
<Style Selector="ComboBox">
19+
<Setter Property="Width" Value="300" />
20+
<Setter Property="ItemsSource" Value="{Binding Items}" />
21+
</Style>
22+
</StackPanel.Styles>
2223

23-
<ComboBox />
24-
<ComboBox Classes="ClearButton" />
25-
<ComboBox PlaceholderText="Please Select" />
26-
<ComboBox IsEnabled="False" />
27-
<ComboBox Classes="Large" IsEnabled="False" />
28-
<ComboBox Classes="Small" />
29-
<ComboBox Classes="Bordered" />
30-
<ComboBox Classes="Bordered" IsEnabled="False" />
31-
<ComboBox>
32-
<ComboBox.SelectionBoxItemTemplate>
33-
<DataTemplate DataType="x:String">
34-
<ContentControl BorderThickness="1"
35-
BorderBrush="Gold"
36-
Content="{Binding}" />
37-
</DataTemplate>
38-
</ComboBox.SelectionBoxItemTemplate>
39-
</ComboBox>
24+
<ComboBox />
25+
<ComboBox Classes="ClearButton" />
26+
<ComboBox PlaceholderText="Please Select" />
27+
<ComboBox IsEnabled="False" />
28+
<ComboBox Classes="Large" IsEnabled="False" />
29+
<ComboBox Classes="Small" />
30+
<ComboBox Classes="Bordered" />
31+
<ComboBox Classes="Bordered" IsEnabled="False" />
32+
<ComboBox>
33+
<ComboBox.SelectionBoxItemTemplate>
34+
<DataTemplate DataType="x:String">
35+
<ContentControl BorderThickness="1"
36+
BorderBrush="Gold"
37+
Content="{Binding}" />
38+
</DataTemplate>
39+
</ComboBox.SelectionBoxItemTemplate>
40+
</ComboBox>
4041

41-
<StackPanel Orientation="Horizontal">
42-
<ComboBox Width="100" Classes="Large" PlaceholderText="Large" />
43-
<ComboBox Width="100" PlaceholderText="Default" />
44-
<ComboBox Width="100" Classes="Small" PlaceholderText="Small" />
45-
</StackPanel>
42+
<StackPanel Orientation="Horizontal">
43+
<ComboBox Width="100" Classes="Large" PlaceholderText="Large" />
44+
<ComboBox Width="100" PlaceholderText="Default" />
45+
<ComboBox Width="100" Classes="Small" PlaceholderText="Small" />
46+
</StackPanel>
4647

47-
<StackPanel Orientation="Horizontal">
48-
<ComboBox Width="100" IsEnabled="False" PlaceholderText="Disabled" />
49-
<ComboBox Width="100" Classes="Bordered" PlaceholderText="Bordered" />
50-
<ComboBox Width="100" Classes="Bordered" IsEnabled="False" />
48+
<StackPanel Orientation="Horizontal">
49+
<ComboBox Width="100" IsEnabled="False" PlaceholderText="Disabled" />
50+
<ComboBox Width="100" Classes="Bordered" PlaceholderText="Bordered" />
51+
<ComboBox Width="100" Classes="Bordered" IsEnabled="False" />
52+
</StackPanel>
53+
<ToggleSwitch Name="toggle" IsChecked="True" Content="IsEditable" />
54+
<ComboBox IsEditable="{Binding #toggle.IsChecked}" />
5155
</StackPanel>
52-
</StackPanel>
56+
</ScrollViewer>
5357
</UserControl>

‎demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml‎

Lines changed: 133 additions & 223 deletions
Large diffs are not rendered by default.

‎demo/Semi.Avalonia.Demo/ViewModels/SplitViewDemoViewModel.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,12 @@ public class SplitViewDemoViewModel : ObservableObject
2626
SplitViewDisplayMode.Overlay,
2727
SplitViewDisplayMode.CompactOverlay,
2828
];
29+
30+
public static ObservableCollection<SplitViewPanePlacement> Placements { get; set; } =
31+
[
32+
SplitViewPanePlacement.Left,
33+
SplitViewPanePlacement.Right,
34+
SplitViewPanePlacement.Top,
35+
SplitViewPanePlacement.Bottom
36+
];
2937
}

‎src/Package.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1111
<PackageIcon>irihi.png</PackageIcon>
1212
<PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
13-
<AvaloniaVersion>11.2.1</AvaloniaVersion>
13+
<AvaloniaVersion>11.3.7</AvaloniaVersion>
1414
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
1515
</PropertyGroup>
1616

‎src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.1"/>
23+
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.7"/>
2424
<None Include="..\..\irihi.png" Pack="true" PackagePath="\" Link="Properties\irihi.png"/>
2525
<None Include="..\..\LICENSE" Pack="true" PackagePath="\" Link="Properties\LICENSE"/>
2626
</ItemGroup>

‎src/Semi.Avalonia/Controls/ComboBox.axaml‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,35 @@
6666
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
6767
TextTrimming="CharacterEllipsis"
6868
Foreground="{TemplateBinding PlaceholderForeground}"
69-
IsVisible="{TemplateBinding SelectionBoxItem,Converter={x:Static ObjectConverters.IsNull}}"
70-
Text="{TemplateBinding PlaceholderText}" />
69+
Text="{TemplateBinding PlaceholderText}">
70+
<TextBlock.IsVisible>
71+
<MultiBinding Converter="{x:Static BoolConverters.And}">
72+
<TemplateBinding Property="SelectionBoxItem" Converter="{x:Static ObjectConverters.IsNull}" />
73+
<TemplateBinding Property="IsEditable" Converter="{x:Static BoolConverters.Not}" />
74+
</MultiBinding>
75+
</TextBlock.IsVisible>
76+
</TextBlock>
7177
<ContentPresenter
7278
Name="ContentPresenter"
7379
Grid.Column="0"
7480
Margin="{TemplateBinding Padding}"
7581
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
7682
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
7783
Content="{TemplateBinding SelectionBoxItem}"
78-
ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" />
84+
ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
85+
IsVisible="{TemplateBinding IsEditable, Converter={x:Static BoolConverters.Not}}" />
86+
<TextBox
87+
Name="PART_EditableTextBox"
88+
Grid.Column="0"
89+
Theme="{StaticResource LooklessTextBox}"
90+
Padding="{TemplateBinding Padding}"
91+
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
92+
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
93+
Foreground="{TemplateBinding Foreground}"
94+
Text="{TemplateBinding Text, Mode=TwoWay}"
95+
Watermark="{TemplateBinding PlaceholderText}"
96+
IsVisible="{TemplateBinding IsEditable}" />
97+
7998
<Button
8099
Name="ClearButton"
81100
Grid.Column="1"
@@ -211,6 +230,11 @@
211230
</Style>
212231
</Style>
213232

233+
<Style Selector="^[IsEditable=true]">
234+
<Setter Property="IsTabStop" Value="False" />
235+
<Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
236+
</Style>
237+
214238
<Style Selector="^.Bordered">
215239
<Style Selector="^ /template/ Border#Background">
216240
<Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBorderedBackground}" />

0 commit comments

Comments
 (0)