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

misc: formatted codes of controls XAML.

Browse Source
This commit is contained in:
Zhang Dian
2025-09-16 21:10:33 +08:00
parent f997bbc29b
commit 0a84c79a15
40 changed files with 101 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Ursa.Themes.Semi/Controls/Anchor.axaml
View File

@@ -88,4 +88,4 @@
</Style> </Style>
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

2
src/Ursa.Themes.Semi/Controls/AutoCompleteBox.axaml
View File

@@ -60,4 +60,4 @@
</Style> </Style>
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

2
src/Ursa.Themes.Semi/Controls/Breadcrumb.axaml
View File

@@ -93,4 +93,4 @@
</Style> </Style>
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

8
src/Ursa.Themes.Semi/Controls/Calendar.axaml
View File

@@ -204,14 +204,14 @@
Classes="Tertiary" Classes="Tertiary"
Grid.Column="0" Grid.Column="0"
Icon="{DynamicResource CalendarViewFastForwardGlyph}" Icon="{DynamicResource CalendarViewFastForwardGlyph}"
Theme="{DynamicResource BorderlessIconButton}"/> Theme="{DynamicResource BorderlessIconButton}" />
<u:IconButton <u:IconButton
Name="{x:Static u:CalendarView.PART_PreviousButton}" Name="{x:Static u:CalendarView.PART_PreviousButton}"
Grid.Column="1" Grid.Column="1"
Classes="Tertiary" Classes="Tertiary"
Icon="{DynamicResource CalendarItemPreviousIconGlyph}" Icon="{DynamicResource CalendarItemPreviousIconGlyph}"
Theme="{DynamicResource BorderlessIconButton}"/> Theme="{DynamicResource BorderlessIconButton}" />
<Grid Grid.Column="2" ColumnDefinitions="*, *"> <Grid Grid.Column="2" ColumnDefinitions="*, *">
<Button <Button
@@ -239,13 +239,13 @@
Grid.Column="3" Grid.Column="3"
Classes="Tertiary" Classes="Tertiary"
Icon="{DynamicResource CalendarItemNextIconGlyph}" Icon="{DynamicResource CalendarItemNextIconGlyph}"
Theme="{DynamicResource BorderlessIconButton}"/> Theme="{DynamicResource BorderlessIconButton}" />
<u:IconButton <u:IconButton
Name="{x:Static u:CalendarView.PART_FastNextButton}" Name="{x:Static u:CalendarView.PART_FastNextButton}"
Grid.Column="4" Grid.Column="4"
Classes="Tertiary" Classes="Tertiary"
Icon="{DynamicResource CalendarViewFastBackwardGlyph}" Icon="{DynamicResource CalendarViewFastBackwardGlyph}"
Theme="{DynamicResource BorderlessIconButton}"/> Theme="{DynamicResource BorderlessIconButton}" />
</Grid> </Grid>
<Grid <Grid
Name="{x:Static u:CalendarView.PART_MonthGrid}" Name="{x:Static u:CalendarView.PART_MonthGrid}"

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

@@ -4,7 +4,7 @@
xmlns:u="https://irihi.tech/ursa" xmlns:u="https://irihi.tech/ursa"
xmlns:converters="clr-namespace:Ursa.Themes.Semi.Converters"> xmlns:converters="clr-namespace:Ursa.Themes.Semi.Converters">
<ControlTheme x:Key="{x:Type u:Clock}" TargetType="u:Clock"> <ControlTheme x:Key="{x:Type u:Clock}" TargetType="u:Clock">
<Setter Property="HandBrush" Value="{DynamicResource ClockHandBrush}"/> <Setter Property="HandBrush" Value="{DynamicResource ClockHandBrush}" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:Clock"> <ControlTemplate TargetType="u:Clock">
<Grid> <Grid>
@@ -57,4 +57,4 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

2
src/Ursa.Themes.Semi/Controls/ControlClassesInput.axaml
View File

@@ -23,4 +23,4 @@
</Setter> </Setter>
--> -->
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

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

@@ -95,7 +95,7 @@
</DataValidationErrors> </DataValidationErrors>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^.clearButton, ^.ClearButton"> <Style Selector="^.clearButton, ^.ClearButton">
<Style Selector="^:pointerover /template/ Button#ClearButton"> <Style Selector="^:pointerover /template/ Button#ClearButton">
<Setter Property="IsVisible" Value="{Binding $parent[u:DatePicker].SelectedDate, Converter={x:Static ObjectConverters.IsNotNull}}" /> <Setter Property="IsVisible" Value="{Binding $parent[u:DatePicker].SelectedDate, Converter={x:Static ObjectConverters.IsNotNull}}" />
@@ -131,4 +131,4 @@
<Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerFocusBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerFocusBorderBrush}" />
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

2
src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml
View File

@@ -170,4 +170,4 @@
<Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerFocusBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerFocusBorderBrush}" />
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

9
src/Ursa.Themes.Semi/Controls/DateTimePicker.axaml
View File

@@ -88,11 +88,12 @@
FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}" FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
FontSize="{DynamicResource DefaultFontSize}" FontSize="{DynamicResource DefaultFontSize}"
IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}" /> IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}" />
<u:TimePickerPresenter Grid.Column="1" <u:TimePickerPresenter
Grid.Column="1"
Name="{x:Static u:DateTimePicker.PART_TimePicker}" Name="{x:Static u:DateTimePicker.PART_TimePicker}"
FontSize="{DynamicResource DefaultFontSize}" FontSize="{DynamicResource DefaultFontSize}"
NeedsConfirmation="{TemplateBinding NeedConfirmation}" NeedsConfirmation="{TemplateBinding NeedConfirmation}"
PanelFormat="{TemplateBinding PanelFormat}"/> PanelFormat="{TemplateBinding PanelFormat}" />
</Grid> </Grid>
</Border> </Border>
</Popup> </Popup>
@@ -102,7 +103,7 @@
</DataValidationErrors> </DataValidationErrors>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^.clearButton, ^.ClearButton"> <Style Selector="^.clearButton, ^.ClearButton">
<Style Selector="^:pointerover /template/ Button#ClearButton"> <Style Selector="^:pointerover /template/ Button#ClearButton">
<Setter Property="IsVisible" Value="{Binding $parent[u:DateTimePicker].SelectedDate, Converter={x:Static ObjectConverters.IsNotNull}}" /> <Setter Property="IsVisible" Value="{Binding $parent[u:DateTimePicker].SelectedDate, Converter={x:Static ObjectConverters.IsNotNull}}" />
@@ -138,4 +139,4 @@
<Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerFocusBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerFocusBorderBrush}" />
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

8
src/Ursa.Themes.Semi/Controls/Dialog.axaml
View File

@@ -17,8 +17,8 @@
<TransformOperationsTransition Property="RenderTransform" Duration="0.2" /> <TransformOperationsTransition Property="RenderTransform" Duration="0.2" />
</Transitions> </Transitions>
</Setter> </Setter>
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/> <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/> <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
<Setter Property="RenderTransform" Value="scale(1.0)" /> <Setter Property="RenderTransform" Value="scale(1.0)" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:CustomDialogControl"> <ControlTemplate TargetType="u:CustomDialogControl">
@@ -134,8 +134,8 @@
<Setter Property="MinWidth" Value="{DynamicResource DialogMinWidth}" /> <Setter Property="MinWidth" Value="{DynamicResource DialogMinWidth}" />
<Setter Property="MinHeight" Value="{DynamicResource DialogMinHeight}" /> <Setter Property="MinHeight" Value="{DynamicResource DialogMinHeight}" />
<Setter Property="CornerRadius" Value="{DynamicResource DialogCornerRadius}" /> <Setter Property="CornerRadius" Value="{DynamicResource DialogCornerRadius}" />
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/> <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/> <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
<Setter Property="Transitions"> <Setter Property="Transitions">
<Transitions> <Transitions>
<TransformOperationsTransition Property="RenderTransform" Duration="0.2" /> <TransformOperationsTransition Property="RenderTransform" Duration="0.2" />

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

@@ -8,9 +8,9 @@
<ControlTemplate TargetType="u:DisableContainer"> <ControlTemplate TargetType="u:DisableContainer">
<Panel> <Panel>
<ContentPresenter Content="{TemplateBinding Content}" /> <ContentPresenter Content="{TemplateBinding Content}" />
<iri:PureRectangle Background="Transparent" IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.IsEnabled, Converter={x:Static BoolConverters.Not}}" Cursor="No" ToolTip.Tip="{TemplateBinding DisabledTip}"/> <iri:PureRectangle Background="Transparent" IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.IsEnabled, Converter={x:Static BoolConverters.Not}}" Cursor="No" ToolTip.Tip="{TemplateBinding DisabledTip}" />
</Panel> </Panel>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

8
src/Ursa.Themes.Semi/Controls/Divider.axaml
View File

@@ -41,7 +41,7 @@
Foreground="{TemplateBinding Foreground}" Foreground="{TemplateBinding Foreground}"
ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplate="{TemplateBinding ContentTemplate}"
Margin="{DynamicResource ThicknessDividerTextMargin}" Margin="{DynamicResource ThicknessDividerTextMargin}"
IsVisible="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}"/> IsVisible="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}" />
<Rectangle Grid.Column="2" Theme="{StaticResource DividerRightLine}" /> <Rectangle Grid.Column="2" Theme="{StaticResource DividerRightLine}" />
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
@@ -62,7 +62,7 @@
Foreground="{TemplateBinding Foreground}" Foreground="{TemplateBinding Foreground}"
ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplate="{TemplateBinding ContentTemplate}"
Margin="{DynamicResource ThicknessDividerTextMargin}" Margin="{DynamicResource ThicknessDividerTextMargin}"
IsVisible="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}"/> IsVisible="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}" />
<Rectangle Grid.Column="2" Theme="{StaticResource DividerRightLine}" /> <Rectangle Grid.Column="2" Theme="{StaticResource DividerRightLine}" />
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
@@ -83,7 +83,7 @@
Foreground="{TemplateBinding Foreground}" Foreground="{TemplateBinding Foreground}"
ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplate="{TemplateBinding ContentTemplate}"
Margin="{DynamicResource ThicknessDividerTextMargin}" Margin="{DynamicResource ThicknessDividerTextMargin}"
IsVisible="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}"/> IsVisible="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}" />
<Rectangle Grid.Column="2" Theme="{StaticResource DividerRightLine}" /> <Rectangle Grid.Column="2" Theme="{StaticResource DividerRightLine}" />
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
@@ -104,7 +104,7 @@
Foreground="{TemplateBinding Foreground}" Foreground="{TemplateBinding Foreground}"
ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplate="{TemplateBinding ContentTemplate}"
Margin="{DynamicResource ThicknessDividerTextMargin}" Margin="{DynamicResource ThicknessDividerTextMargin}"
IsVisible="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}"/> IsVisible="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}" />
<Rectangle Grid.Column="2" Theme="{StaticResource DividerRightLine}" /> <Rectangle Grid.Column="2" Theme="{StaticResource DividerRightLine}" />
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>

10
src/Ursa.Themes.Semi/Controls/Drawer.axaml
View File

@@ -8,8 +8,8 @@
<Setter Property="HorizontalAlignment" Value="Stretch" /> <Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="MinWidth" Value="96" /> <Setter Property="MinWidth" Value="96" />
<Setter Property="MinHeight" Value="96" /> <Setter Property="MinHeight" Value="96" />
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/> <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/> <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
<Setter Property="Padding" Value="{DynamicResource DrawerMargin}" /> <Setter Property="Padding" Value="{DynamicResource DrawerMargin}" />
<Setter Property="BorderThickness" Value="{DynamicResource DrawerBorderThickness}" /> <Setter Property="BorderThickness" Value="{DynamicResource DrawerBorderThickness}" />
<Setter Property="CornerRadius" Value="{DynamicResource DrawerCornerRadius}" /> <Setter Property="CornerRadius" Value="{DynamicResource DrawerCornerRadius}" />
@@ -105,8 +105,8 @@
<Setter Property="HorizontalAlignment" Value="Stretch" /> <Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="MinWidth" Value="96" /> <Setter Property="MinWidth" Value="96" />
<Setter Property="MinHeight" Value="96" /> <Setter Property="MinHeight" Value="96" />
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/> <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/> <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
<Setter Property="Padding" Value="{DynamicResource DrawerMargin}" /> <Setter Property="Padding" Value="{DynamicResource DrawerMargin}" />
<Setter Property="BorderThickness" Value="{DynamicResource DrawerBorderThickness}" /> <Setter Property="BorderThickness" Value="{DynamicResource DrawerBorderThickness}" />
<Setter Property="CornerRadius" Value="{DynamicResource DrawerCornerRadius}" /> <Setter Property="CornerRadius" Value="{DynamicResource DrawerCornerRadius}" />
@@ -238,4 +238,4 @@
<Setter Property="ResizeDirection" Value="Left" /> <Setter Property="ResizeDirection" Value="Left" />
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

2
src/Ursa.Themes.Semi/Controls/EnumSelector.axaml
View File

@@ -32,4 +32,4 @@
</Setter> </Setter>
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

5
src/Ursa.Themes.Semi/Controls/Form.axaml
View File

@@ -80,8 +80,7 @@
<ControlTemplate TargetType="u:FormItem"> <ControlTemplate TargetType="u:FormItem">
<Grid RowDefinitions="*, *"> <Grid RowDefinitions="*, *">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" <ColumnDefinition Width="Auto" SharedSizeGroup="Label" />
SharedSizeGroup="Label" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Border <Border
@@ -98,7 +97,7 @@
Name="PART_Label" Name="PART_Label"
Content="{TemplateBinding Label}" Content="{TemplateBinding Label}"
Background="Transparent" Background="Transparent"
FontWeight="{DynamicResource TextBlockTitleFontWeight}"/> FontWeight="{DynamicResource TextBlockTitleFontWeight}" />
<TextBlock <TextBlock
Foreground="{DynamicResource FormAsteriskForeground}" Foreground="{DynamicResource FormAsteriskForeground}"
IsVisible="{TemplateBinding IsRequired}" IsVisible="{TemplateBinding IsRequired}"

2
src/Ursa.Themes.Semi/Controls/IPv4Box.axaml
View File

@@ -129,4 +129,4 @@
<Setter Property="BorderBrush" Value="{DynamicResource TextBoxDisabledBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDisabledBorderBrush}" />
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

2
src/Ursa.Themes.Semi/Controls/ImageViewer.axaml
View File

@@ -28,4 +28,4 @@
<Setter Property="Cursor" Value="Hand" /> <Setter Property="Cursor" Value="Hand" />
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

17
src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml
View File

@@ -25,8 +25,9 @@
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}"> CornerRadius="{TemplateBinding CornerRadius}">
<Panel VerticalAlignment="Stretch" Margin="{TemplateBinding Padding}"> <Panel VerticalAlignment="Stretch" Margin="{TemplateBinding Padding}">
<Grid ColumnDefinitions="Auto, *, Auto" > <Grid ColumnDefinitions="Auto, *, Auto">
<ContentPresenter Grid.Column="0" <ContentPresenter
Grid.Column="0"
Content="{TemplateBinding InnerLeftContent}" Content="{TemplateBinding InnerLeftContent}"
Padding="{TemplateBinding Padding, Converter={iri:ThicknessMixerConverter Right}}" Padding="{TemplateBinding Padding, Converter={iri:ThicknessMixerConverter Right}}"
DockPanel.Dock="Left" DockPanel.Dock="Left"
@@ -34,7 +35,7 @@
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Foreground="{DynamicResource TextBoxInnerForeground}" Foreground="{DynamicResource TextBoxInnerForeground}"
IsVisible="{Binding Path=InnerLeftContent, RelativeSource={RelativeSource TemplatedParent}, IsVisible="{Binding Path=InnerLeftContent, RelativeSource={RelativeSource TemplatedParent},
Converter={x:Static ObjectConverters.IsNotNull}}" /> Converter={x:Static ObjectConverters.IsNotNull}}" />
<ContentPresenter <ContentPresenter
Grid.Column="2" Grid.Column="2"
Content="{TemplateBinding InnerRightContent}" Content="{TemplateBinding InnerRightContent}"
@@ -44,14 +45,14 @@
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Foreground="{DynamicResource TextBoxInnerForeground}" Foreground="{DynamicResource TextBoxInnerForeground}"
IsVisible="{Binding Path=InnerRightContent, RelativeSource={RelativeSource TemplatedParent}, IsVisible="{Binding Path=InnerRightContent, RelativeSource={RelativeSource TemplatedParent},
Converter={x:Static ObjectConverters.IsNotNull}}" /> Converter={x:Static ObjectConverters.IsNotNull}}" />
<SelectableTextBlock <SelectableTextBlock
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Text="{TemplateBinding Gesture, Text="{TemplateBinding Gesture,Converter={StaticResource KeyGestureConverter}}" />
Converter={StaticResource KeyGestureConverter}}" /> <Button
<Button Grid.Column="1" Grid.Column="1"
Name="PART_ClearButton" Name="PART_ClearButton"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Command="{Binding $parent[u:KeyGestureInput].Clear}" Command="{Binding $parent[u:KeyGestureInput].Clear}"
@@ -87,4 +88,4 @@
</Style> </Style>
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

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

@@ -6,7 +6,7 @@
xmlns:converters="clr-namespace:Ursa.Themes.Semi.Converters"> xmlns:converters="clr-namespace:Ursa.Themes.Semi.Converters">
<Design.PreviewWith> <Design.PreviewWith>
<StackPanel Margin="20"> <StackPanel Margin="20">
<u:LoadingIcon Classes="Large"/> <u:LoadingIcon Classes="Large" />
</StackPanel> </StackPanel>
</Design.PreviewWith> </Design.PreviewWith>
<converters:BrushToColorConverter x:Key="BrushToColorConverter" /> <converters:BrushToColorConverter x:Key="BrushToColorConverter" />
@@ -127,4 +127,4 @@
<Setter Property="Effect" Value="blur(5)" /> <Setter Property="Effect" Value="blur(5)" />
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

2
src/Ursa.Themes.Semi/Controls/Marquee.axaml
View File

@@ -22,4 +22,4 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

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

@@ -179,7 +179,7 @@
<Setter Property="Foreground" Value="{DynamicResource ComboBoxIconPressedForeground}" /> <Setter Property="Foreground" Value="{DynamicResource ComboBoxIconPressedForeground}" />
</Style> </Style>
</Style> </Style>
<Style Selector="^:focus"> <Style Selector="^:focus">
<Setter Property="Background" Value="{DynamicResource ComboBoxSelectorFocusBackground}" /> <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorFocusBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorFocusBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorFocusBorderBrush}" />
@@ -301,4 +301,4 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

10
src/Ursa.Themes.Semi/Controls/NavMenu.axaml
View File

@@ -45,13 +45,9 @@
<Setter Property="Grid.IsSharedSizeScope" Value="False" /> <Setter Property="Grid.IsSharedSizeScope" Value="False" />
</Style> </Style>
<Style Selector="^.enable_animation"> <Style Selector="^.enable_animation">
<Setter Property="u:SizeAnimationHelper.TriggerAvaloniaProperty" <Setter Property="u:SizeAnimationHelper.TriggerAvaloniaProperty" Value="{x:Static u:NavMenu.IsHorizontalCollapsedProperty}" />
Value="{x:Static u:NavMenu.IsHorizontalCollapsedProperty}"> <Setter Property="u:SizeAnimationHelper.CreateAnimation" Value="{DynamicResource NavMenuWidthAnimationGenerator}" />
</Setter> <Setter Property="u:SizeAnimationHelper.EnableWHAnimation" Value="True" />
<Setter Property="u:SizeAnimationHelper.CreateAnimation"
Value="{DynamicResource NavMenuWidthAnimationGenerator}">
</Setter>
<Setter Property="u:SizeAnimationHelper.EnableWHAnimation" Value="True"></Setter>
</Style> </Style>
</ControlTheme> </ControlTheme>

2
src/Ursa.Themes.Semi/Controls/NumPad.axaml
View File

@@ -222,4 +222,4 @@
<Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" /> <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

2
src/Ursa.Themes.Semi/Controls/NumberDisplayer.axaml
View File

@@ -33,4 +33,4 @@
</Setter> </Setter>
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

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

@@ -39,7 +39,7 @@
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Background="Transparent" Background="Transparent"
Cursor="SizeAll"/> Cursor="SizeAll" />
<Button <Button
Name="PART_ClearButton" Name="PART_ClearButton"
Margin="0,0,8,0" Margin="0,0,8,0"
@@ -63,7 +63,7 @@
<Setter Property="IsVisible" Value="True" /> <Setter Property="IsVisible" Value="True" />
</Style> </Style>
</Style> </Style>
<Style Selector="^.Large"> <Style Selector="^.Large">
<Setter Property="MinHeight" Value="{DynamicResource NumericUpDownLargeHeight}" /> <Setter Property="MinHeight" Value="{DynamicResource NumericUpDownLargeHeight}" />
</Style> </Style>
@@ -71,4 +71,4 @@
<Setter Property="MinHeight" Value="{DynamicResource NumericUpDownSmallHeight}" /> <Setter Property="MinHeight" Value="{DynamicResource NumericUpDownSmallHeight}" />
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

2
src/Ursa.Themes.Semi/Controls/PinCode.axaml
View File

@@ -86,4 +86,4 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

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

@@ -209,7 +209,7 @@
<Style Selector="^:error /template/ Thumb#thumb"> <Style Selector="^:error /template/ Thumb#thumb">
<Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
</Style> </Style>
<Style Selector="^:disabled"> <Style Selector="^:disabled">
<Style Selector="^ /template/ Border#PART_InnerSection"> <Style Selector="^ /template/ Border#PART_InnerSection">
<Setter Property="Background" Value="{DynamicResource SliderTrackDisabledForeground}" /> <Setter Property="Background" Value="{DynamicResource SliderTrackDisabledForeground}" />
@@ -224,4 +224,4 @@
</Style> </Style>
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

2
src/Ursa.Themes.Semi/Controls/Resizer.axaml
View File

@@ -142,4 +142,4 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

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

@@ -40,8 +40,8 @@
<Setter Property="RenderTransform" Value="rotate(270deg)" /> <Setter Property="RenderTransform" Value="rotate(270deg)" />
</Style> </Style>
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="PrimaryScrollToButton" TargetType="u:ScrollToButton"> <ControlTheme x:Key="PrimaryScrollToButton" TargetType="u:ScrollToButton">
<Setter Property="HorizontalAlignment" Value="Right" /> <Setter Property="HorizontalAlignment" Value="Right" />
<Setter Property="VerticalAlignment" Value="Bottom" /> <Setter Property="VerticalAlignment" Value="Bottom" />

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

@@ -38,7 +38,7 @@
<ControlTheme x:Key="{x:Type u:SelectionListItem}" TargetType="u:SelectionListItem"> <ControlTheme x:Key="{x:Type u:SelectionListItem}" TargetType="u:SelectionListItem">
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="HorizontalContentAlignment" Value="Left" /> <Setter Property="HorizontalContentAlignment" Value="Left" />
<Setter Property="VerticalContentAlignment" Value="Center"/> <Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="Padding" Value="8" /> <Setter Property="Padding" Value="8" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:SelectionListItem"> <ControlTemplate TargetType="u:SelectionListItem">
@@ -58,4 +58,4 @@
<Setter Property="FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" /> <Setter Property="FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" />
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

2
src/Ursa.Themes.Semi/Controls/Skeleton.axaml
View File

@@ -35,4 +35,4 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

2
src/Ursa.Themes.Semi/Controls/TagInput.axaml
View File

@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:u="https://irihi.tech/ursa"> xmlns:u="https://irihi.tech/ursa">
<Design.PreviewWith> <Design.PreviewWith>
<u:ClosableTag Content="Closable Tag"/> <u:ClosableTag Content="Closable Tag" />
</Design.PreviewWith> </Design.PreviewWith>
<ControlTheme x:Key="{x:Type u:TagInput}" TargetType="u:TagInput"> <ControlTheme x:Key="{x:Type u:TagInput}" TargetType="u:TagInput">
<Setter Property="InputTheme" Value="{DynamicResource TagInputTextBoxTheme}" /> <Setter Property="InputTheme" Value="{DynamicResource TagInputTextBoxTheme}" />

17
src/Ursa.Themes.Semi/Controls/TimePicker.axaml
View File

@@ -106,7 +106,7 @@
<Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
<Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" /> <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
<Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" /> <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
<Setter Property="MinHeight" Value="32"/> <Setter Property="MinHeight" Value="32" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:TimePicker"> <ControlTemplate TargetType="u:TimePicker">
<DataValidationErrors> <DataValidationErrors>
@@ -153,8 +153,7 @@
Name="{x:Static iri:PartNames.PART_Popup}" Name="{x:Static iri:PartNames.PART_Popup}"
Grid.Column="0" Grid.Column="0"
IsLightDismissEnabled="True" IsLightDismissEnabled="True"
IsOpen="{TemplateBinding IsDropdownOpen, IsOpen="{TemplateBinding IsDropdownOpen,Mode=TwoWay}"
Mode=TwoWay}"
Placement="BottomEdgeAlignedLeft" Placement="BottomEdgeAlignedLeft"
PlacementTarget="Background"> PlacementTarget="Background">
<Border <Border
@@ -178,19 +177,17 @@
Margin="8,8,8,0" Margin="8,8,8,0"
Content="{TemplateBinding PopupInnerTopContent}" Content="{TemplateBinding PopupInnerTopContent}"
DockPanel.Dock="Top" DockPanel.Dock="Top"
IsVisible="{TemplateBinding PopupInnerTopContent, IsVisible="{TemplateBinding PopupInnerTopContent,Converter={x:Static ObjectConverters.IsNotNull}}" />
Converter={x:Static ObjectConverters.IsNotNull}}" />
<ContentPresenter <ContentPresenter
Name="PART_PopupFooter" Name="PART_PopupFooter"
Margin="8,0,8,8" Margin="8,0,8,8"
Content="{TemplateBinding PopupInnerBottomContent}" Content="{TemplateBinding PopupInnerBottomContent}"
DockPanel.Dock="Bottom" DockPanel.Dock="Bottom"
IsVisible="{TemplateBinding PopupInnerBottomContent, IsVisible="{TemplateBinding PopupInnerBottomContent,Converter={x:Static ObjectConverters.IsNotNull}}" />
Converter={x:Static ObjectConverters.IsNotNull}}" />
<u:TimePickerPresenter <u:TimePickerPresenter
Name="{x:Static u:TimePicker.PART_Presenter}" Name="{x:Static u:TimePicker.PART_Presenter}"
NeedsConfirmation="{TemplateBinding NeedConfirmation}" NeedsConfirmation="{TemplateBinding NeedConfirmation}"
PanelFormat="{TemplateBinding PanelFormat}"/> PanelFormat="{TemplateBinding PanelFormat}" />
</DockPanel> </DockPanel>
</Border> </Border>
</Popup> </Popup>
@@ -205,7 +202,7 @@
<Setter Property="IsVisible" Value="{Binding $parent[u:TimePicker].SelectedTime, Converter={x:Static ObjectConverters.IsNotNull}}" /> <Setter Property="IsVisible" Value="{Binding $parent[u:TimePicker].SelectedTime, Converter={x:Static ObjectConverters.IsNotNull}}" />
</Style> </Style>
<Style Selector="^:pointerover /template/ Button#PART_Button"> <Style Selector="^:pointerover /template/ Button#PART_Button">
<Setter Property="IsVisible" Value="{Binding $parent[u:TimePicker].SelectedTime, Converter={x:Static ObjectConverters.IsNull}}"/> <Setter Property="IsVisible" Value="{Binding $parent[u:TimePicker].SelectedTime, Converter={x:Static ObjectConverters.IsNull}}" />
</Style> </Style>
</Style> </Style>
@@ -238,4 +235,4 @@
<Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerFocusBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerFocusBorderBrush}" />
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

8
src/Ursa.Themes.Semi/Controls/TimeRangePicker.axaml
View File

@@ -138,8 +138,7 @@
Grid.Row="2" Grid.Row="2"
Grid.Column="0" Grid.Column="0"
NeedsConfirmation="{TemplateBinding NeedConfirmation}" NeedsConfirmation="{TemplateBinding NeedConfirmation}"
PanelFormat="{TemplateBinding PanelFormat}" PanelFormat="{TemplateBinding PanelFormat}" />
/>
<Rectangle <Rectangle
Grid.Row="2" Grid.Row="2"
Grid.Column="1" Grid.Column="1"
@@ -152,8 +151,7 @@
Grid.Row="2" Grid.Row="2"
Grid.Column="2" Grid.Column="2"
NeedsConfirmation="{TemplateBinding NeedConfirmation}" NeedsConfirmation="{TemplateBinding NeedConfirmation}"
PanelFormat="{TemplateBinding PanelFormat}" PanelFormat="{TemplateBinding PanelFormat}" />
/>
</Grid> </Grid>
</DockPanel> </DockPanel>
</Border> </Border>
@@ -192,4 +190,4 @@
<Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerFocusBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerFocusBorderBrush}" />
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

20
src/Ursa.Themes.Semi/Controls/Timeline.axaml
View File

@@ -87,7 +87,7 @@
VerticalAlignment="Top" VerticalAlignment="Top"
Content="{TemplateBinding Content}" Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplate="{TemplateBinding ContentTemplate}"
TextElement.FontSize="12"/> TextElement.FontSize="12" />
<TextBlock <TextBlock
Name="{x:Static u:TimelineItem.PART_Time}" Name="{x:Static u:TimelineItem.PART_Time}"
Grid.Row="0" Grid.Row="0"
@@ -110,28 +110,28 @@
<Setter Property="Fill" Value="Transparent" /> <Setter Property="Fill" Value="Transparent" />
</Style> </Style>
<Style Selector="^ /template/ TextBlock#PART_Time"> <Style Selector="^ /template/ TextBlock#PART_Time">
<Setter Property="Foreground" Value="{DynamicResource TextBlockTertiaryForeground}"/> <Setter Property="Foreground" Value="{DynamicResource TextBlockTertiaryForeground}" />
</Style> </Style>
<Style Selector="^ /template/ ContentPresenter#PART_Content"> <Style Selector="^ /template/ ContentPresenter#PART_Content">
<Setter Property="TextElement.Foreground" Value="{DynamicResource TextBlockTertiaryForeground}"/> <Setter Property="TextElement.Foreground" Value="{DynamicResource TextBlockTertiaryForeground}" />
</Style> </Style>
<Style Selector="^:empty-icon /template/ Ellipse#PART_DefaultIcon"> <Style Selector="^:empty-icon /template/ Ellipse#PART_DefaultIcon">
<Setter Property="IsVisible" Value="True"/> <Setter Property="IsVisible" Value="True" />
</Style> </Style>
<Style Selector="^:empty-icon[Type=Default] /template/ Ellipse#PART_DefaultIcon"> <Style Selector="^:empty-icon[Type=Default] /template/ Ellipse#PART_DefaultIcon">
<Setter Property="Fill" Value="{DynamicResource SemiGrey6}"/> <Setter Property="Fill" Value="{DynamicResource SemiGrey6}" />
</Style> </Style>
<Style Selector="^:empty-icon[Type=Error] /template/ Ellipse#PART_DefaultIcon"> <Style Selector="^:empty-icon[Type=Error] /template/ Ellipse#PART_DefaultIcon">
<Setter Property="Fill" Value="{DynamicResource SemiRed6}"/> <Setter Property="Fill" Value="{DynamicResource SemiRed6}" />
</Style> </Style>
<Style Selector="^:empty-icon[Type=Ongoing] /template/ Ellipse#PART_DefaultIcon"> <Style Selector="^:empty-icon[Type=Ongoing] /template/ Ellipse#PART_DefaultIcon">
<Setter Property="Fill" Value="{DynamicResource SemiBlue6}"/> <Setter Property="Fill" Value="{DynamicResource SemiBlue6}" />
</Style> </Style>
<Style Selector="^:empty-icon[Type=Success] /template/ Ellipse#PART_DefaultIcon"> <Style Selector="^:empty-icon[Type=Success] /template/ Ellipse#PART_DefaultIcon">
<Setter Property="Fill" Value="{DynamicResource SemiGreen6}"/> <Setter Property="Fill" Value="{DynamicResource SemiGreen6}" />
</Style> </Style>
<Style Selector="^:empty-icon[Type=Warning] /template/ Ellipse#PART_DefaultIcon"> <Style Selector="^:empty-icon[Type=Warning] /template/ Ellipse#PART_DefaultIcon">
<Setter Property="Fill" Value="{DynamicResource SemiOrange6}"/> <Setter Property="Fill" Value="{DynamicResource SemiOrange6}" />
</Style> </Style>
<Style Selector="^:all-left"> <Style Selector="^:all-left">
<Style Selector="^ /template/ ContentPresenter#PART_Header"> <Style Selector="^ /template/ ContentPresenter#PART_Header">
@@ -197,4 +197,4 @@
</Style> </Style>
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

8
src/Ursa.Themes.Semi/Controls/ToolBar.axaml
View File

@@ -25,9 +25,9 @@
</Setter> </Setter>
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="{x:Type u:ToolBar}" TargetType="u:ToolBar"> <ControlTheme x:Key="{x:Type u:ToolBar}" TargetType="u:ToolBar">
<Setter Property="HorizontalAlignment" Value="Left"/> <Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Top"/> <Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="Background" Value="Transparent"/> <Setter Property="Background" Value="Transparent" />
<Setter Property="ItemsPanel"> <Setter Property="ItemsPanel">
<ItemsPanelTemplate> <ItemsPanelTemplate>
<u:ToolBarPanel /> <u:ToolBarPanel />
@@ -136,4 +136,4 @@
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

2
src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml
View File

@@ -316,4 +316,4 @@
<Setter Property="IsHitTestVisible" Value="False" /> <Setter Property="IsHitTestVisible" Value="False" />
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

2
src/Ursa.Themes.Semi/Controls/TwoTonePathIcon.axaml
View File

@@ -34,4 +34,4 @@
<Setter Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ActiveStrokeBrush}" /> <Setter Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ActiveStrokeBrush}" />
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

2
src/Ursa.Themes.Semi/Controls/UrsaView.axaml
View File

@@ -43,4 +43,4 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

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

@@ -13,7 +13,7 @@
<Setter Property="u:OverlayDialogHost.IsModalStatusScope" Value="True" /> <Setter Property="u:OverlayDialogHost.IsModalStatusScope" Value="True" />
<Setter Property="IsMinimizeButtonVisible" Value="{OnPlatform {x:True},macOS={x:False}}" /> <Setter Property="IsMinimizeButtonVisible" Value="{OnPlatform {x:True},macOS={x:False}}" />
<Setter Property="IsRestoreButtonVisible" Value="{OnPlatform {x:True},macOS={x:False}}" /> <Setter Property="IsRestoreButtonVisible" Value="{OnPlatform {x:True},macOS={x:False}}" />
<Setter Property="IsCloseButtonVisible" Value="{OnPlatform {x:True},macOS={x:False}}"/> <Setter Property="IsCloseButtonVisible" Value="{OnPlatform {x:True},macOS={x:False}}" />
<Setter Property="SystemDecorations"> <Setter Property="SystemDecorations">
<OnPlatform> <OnPlatform>
<On Options="Default"> <On Options="Default">
@@ -47,9 +47,9 @@
RightContent="{Binding $parent[u:UrsaWindow].RightContent}" /> RightContent="{Binding $parent[u:UrsaWindow].RightContent}" />
<VisualLayerManager> <VisualLayerManager>
<Panel> <Panel>
<u:OverlayDialogHost <u:OverlayDialogHost
Name="{x:Static u:UrsaWindow.PART_DialogHost}" Name="{x:Static u:UrsaWindow.PART_DialogHost}"
IsModalStatusReporter="True" IsModalStatusReporter="True"
IsTopLevel="True" /> IsTopLevel="True" />
<u:WindowResizer <u:WindowResizer
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"