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

feat: finish.

Browse Source
This commit is contained in:
rabbitism
2024-10-03 01:50:07 +08:00
parent 3189968128
commit d52f97a058
19 changed files with 211 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -267,11 +267,13 @@
<!-- Pointerover State --> <!-- Pointerover State -->
<Style Selector="^:pointerover"> <Style Selector="^:pointerover">
<Setter Property="Foreground" Value="{DynamicResource ComboBoxItemPointeroverForeground}" />
<Setter Property="Background" Value="{DynamicResource ListBoxItemPointeroverBackground}" /> <Setter Property="Background" Value="{DynamicResource ListBoxItemPointeroverBackground}" />
</Style> </Style>
<!-- Pressed State --> <!-- Pressed State -->
<Style Selector="^:pressed"> <Style Selector="^:pressed">
<Setter Property="Foreground" Value="{DynamicResource ComboBoxItemPressedForeground}" />
<Setter Property="Background" Value="{DynamicResource ListBoxItemPressedBackground}" /> <Setter Property="Background" Value="{DynamicResource ListBoxItemPressedBackground}" />
</Style> </Style>

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

@@ -10,7 +10,7 @@
Margin="2" Margin="2"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Background="{DynamicResource SemiBlue1}" Background="{DynamicResource SelectionListIndicatorBackground}"
Theme="{DynamicResource CardBorder}" /> Theme="{DynamicResource CardBorder}" />
</Template> </Template>
</Setter> </Setter>

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

@@ -6,7 +6,7 @@
<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}" />
<Setter Property="HorizontalAlignment" Value="Stretch" /> <Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="MinHeight" Value="{DynamicResource TagInputDefaultHeight}" /> <Setter Property="MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
<Setter Property="VerticalAlignment" Value="Top" /> <Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="ItemTemplate"> <Setter Property="ItemTemplate">
<DataTemplate> <DataTemplate>
@@ -22,8 +22,8 @@
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Background="{DynamicResource TextBoxDefaultBackground}" Background="{DynamicResource TextBoxDefaultBackground}"
BorderBrush="{DynamicResource TextBoxDefaultBorderBrush}" BorderBrush="{DynamicResource TextBoxDefaultBorderBrush}"
BorderThickness="1" BorderThickness="{DynamicResource TextBoxBorderThickness}"
CornerRadius="3"> CornerRadius="{DynamicResource TextBoxDefaultCornerRadius}">
<Panel HorizontalAlignment="Stretch"> <Panel HorizontalAlignment="Stretch">
<TextBlock <TextBlock
Name="{x:Static u:TagInput.PART_Watermark}" Name="{x:Static u:TagInput.PART_Watermark}"
@@ -53,6 +53,7 @@
</Style> </Style>
<Style Selector="^:pointerover /template/ Border#PART_BackgroundBorder"> <Style Selector="^:pointerover /template/ Border#PART_BackgroundBorder">
<Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" /> <Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource TextBoxPointeroverBorderBrush}" />
</Style> </Style>
<Style Selector="^:focus-within /template/ Border#PART_BackgroundBorder"> <Style Selector="^:focus-within /template/ Border#PART_BackgroundBorder">
<Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
@@ -60,13 +61,13 @@
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="TagInputTextBoxTheme" TargetType="TextBox"> <ControlTheme x:Key="TagInputTextBoxTheme" TargetType="TextBox">
<Setter Property="TextBox.Foreground" Value="{DynamicResource TextBoxForeground}" /> <Setter Property="Foreground" Value="{DynamicResource TextBoxInnerForeground}" />
<Setter Property="TextBox.Background" Value="{DynamicResource TextBoxDefaultBackground}" /> <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
<Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
<Setter Property="TextBox.SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" /> <Setter Property="SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
<Setter Property="TextBox.SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" /> <Setter Property="SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
<Setter Property="TextBox.Cursor" Value="Ibeam" /> <Setter Property="Cursor" Value="Ibeam" />
<Setter Property="TextBox.CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" /> <Setter Property="CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" /> <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
@@ -106,10 +107,10 @@
<ControlTheme x:Key="{x:Type u:ClosableTag}" TargetType="u:ClosableTag"> <ControlTheme x:Key="{x:Type u:ClosableTag}" TargetType="u:ClosableTag">
<Setter Property="VerticalAlignment" Value="Stretch" /> <Setter Property="VerticalAlignment" Value="Stretch" />
<Setter Property="u:ClosableTag.Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" /> <Setter Property="Foreground" Value="{DynamicResource ClosableTagForeground}" />
<Setter Property="u:ClosableTag.Background" Value="{DynamicResource ClosableTagBackground}" /> <Setter Property="Background" Value="{DynamicResource ClosableTagBackground}" />
<Setter Property="u:ClosableTag.BorderBrush" Value="{DynamicResource SemiColorBorder}" /> <Setter Property="BorderBrush" Value="{DynamicResource ClosableTagBorder}" />
<Setter Property="u:ClosableTag.BorderThickness" Value="1" /> <Setter Property="BorderThickness" Value="1" />
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:ClosableTag"> <ControlTemplate TargetType="u:ClosableTag">

79
src/Ursa.Themes.Semi/Controls/TextBox.axaml
View File

@@ -1,79 +0,0 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<ControlTheme x:Key="LooklessTextBox" TargetType="TextBox">
<Setter Property="TextBox.Foreground" Value="{DynamicResource TextBoxForeground}" />
<Setter Property="TextBox.SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
<Setter Property="TextBox.SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
<Setter Property="TextBox.FontSize" Value="14" />
<Setter Property="TextBox.Cursor" Value="Ibeam" />
<Setter Property="TextBox.CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
<Setter Property="TextBox.Padding" Value="{DynamicResource TextBoxContentPadding}" />
<Setter Property="TextBox.MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
<Setter Property="TextBox.VerticalAlignment" Value="Center" />
<Setter Property="TextBox.VerticalContentAlignment" Value="Center" />
<Setter Property="TextBox.FocusAdorner" Value="{x:Null}" />
<Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
<Setter Property="TextBox.Template">
<ControlTemplate TargetType="TextBox">
<Border Name="PART_ContentPresenterBorder" MinHeight="{TemplateBinding MinHeight}">
<Grid Margin="{TemplateBinding Padding}" ColumnDefinitions="Auto, *, Auto">
<ContentPresenter
Grid.Column="0"
Padding="{DynamicResource TextBoxInnerLeftContentPadding}"
VerticalAlignment="Center"
Content="{TemplateBinding InnerLeftContent}"
Foreground="{DynamicResource TextBoxInnerForeground}"
IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerLeftContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
<ScrollViewer
Grid.Column="1"
AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
<Panel>
<TextBlock
Name="PART_Watermark"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
IsVisible="{TemplateBinding Text,
Converter={x:Static StringConverters.IsNullOrEmpty}}"
Opacity="0.5"
Text="{TemplateBinding Watermark}"
TextAlignment="{TemplateBinding TextAlignment}"
TextWrapping="{TemplateBinding TextWrapping}" />
<TextPresenter
Name="PART_TextPresenter"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
CaretBrush="{TemplateBinding CaretBrush}"
CaretIndex="{TemplateBinding CaretIndex}"
LineHeight="{TemplateBinding LineHeight}"
PasswordChar="{TemplateBinding PasswordChar}"
RevealPassword="{TemplateBinding RevealPassword}"
SelectionBrush="{TemplateBinding SelectionBrush}"
SelectionEnd="{TemplateBinding SelectionEnd}"
SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
SelectionStart="{TemplateBinding SelectionStart}"
Text="{TemplateBinding Text,
Mode=TwoWay}"
TextAlignment="{TemplateBinding TextAlignment}"
TextWrapping="{TemplateBinding TextWrapping}" />
</Panel>
</ScrollViewer>
<ContentPresenter
Grid.Column="2"
Padding="{DynamicResource TextBoxInnerRightContentPadding}"
VerticalAlignment="Center"
Content="{TemplateBinding InnerRightContent}"
Foreground="{DynamicResource TextBoxInnerForeground}"
IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerRightContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
</Grid>
</Border>
</ControlTemplate>
</Setter>
<Style Selector="^:disabled">
<Setter Property="Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
</Style>
</ControlTheme>
</ResourceDictionary>

208
src/Ursa.Themes.Semi/Controls/TimeBox.axaml
View File

@@ -1,52 +1,58 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" <ResourceDictionary
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns="https://github.com/avaloniaui"
xmlns:u="https://irihi.tech/ursa"> xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
<!-- Add Resources Here --> xmlns:u="https://irihi.tech/ursa">
<!-- Add Resources Here -->
<Design.PreviewWith> <Design.PreviewWith>
<StackPanel Margin="20"> <StackPanel Margin="20">
<TextBlock Text="Hello World"/> <TextBlock Text="Hello World" />
</StackPanel> </StackPanel>
</Design.PreviewWith> </Design.PreviewWith>
<ControlTheme x:Key="{x:Type u:TimeBox}" TargetType="{x:Type u:TimeBox}"> <ControlTheme x:Key="{x:Type u:TimeBox}" TargetType="{x:Type u:TimeBox}">
<Setter Property="u:TimeBox.Focusable" Value="True"/> <Setter Property="Focusable" Value="True" />
<Setter Property="u:TimeBox.ShowLeadingZero" Value="True"/> <Setter Property="ShowLeadingZero" Value="True" />
<Setter Property="u:TimeBox.TextAlignment" Value="Center"/> <Setter Property="TextAlignment" Value="Center" />
<Setter Property="u:TimeBox.HorizontalAlignment" Value="Left"/> <Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="u:TimeBox.CornerRadius" Value="{DynamicResource TimeBoxCornerRadius}" /> <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
<Setter Property="u:TimeBox.Background" Value="{DynamicResource TimeBoxBackground}" /> <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
<Setter Property="u:TimeBox.MinHeight" Value="{DynamicResource TimeBoxDefaultMinHeight}" /> <Setter Property="MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
<Setter Property="u:TimeBox.BorderThickness" Value="{DynamicResource TimeBoxBorderThickness}" /> <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
<Setter Property="u:TimeBox.SelectionBrush" Value="{DynamicResource TimeBoxSelectionBrush}" /> <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
<Setter Property="u:TimeBox.SelectionForegroundBrush" Value="{DynamicResource TimeBoxSelectionForeground}" /> <Setter Property="SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
<Setter Property="u:TimeBox.CaretBrush" Value="{DynamicResource TimeBoxCaretBrush}" /> <Setter Property="SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
<Setter Property="u:TimeBox.Template"> <Setter Property="CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
<Setter Property="Template">
<ControlTemplate TargetType="u:TimeBox"> <ControlTemplate TargetType="u:TimeBox">
<Border Name="PART_Border" <Border
Name="PART_Border"
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 Width="{TemplateBinding Width}" ColumnDefinitions="1*, Auto, 1*, Auto, 1*, Auto, 1*"> <Grid Width="{TemplateBinding Width}" ColumnDefinitions="1*, Auto, 1*, Auto, 1*, Auto, 1*">
<Border Name="{x:Static u:TimeBox.PART_HourBorder}" <Border
Grid.Column="0" Name="{x:Static u:TimeBox.PART_HourBorder}"
Background="Transparent" Grid.Column="0"
BorderBrush="Transparent" Background="Transparent"
BorderThickness="0" BorderBrush="Transparent"
CornerRadius="{TemplateBinding CornerRadius}"> BorderThickness="0"
CornerRadius="{TemplateBinding CornerRadius}">
<Grid> <Grid>
<TextPresenter Name="{x:Static u:TimeBox.PART_HoursTextPresenter}" <TextPresenter
MinWidth="8" Name="{x:Static u:TimeBox.PART_HoursTextPresenter}"
VerticalAlignment="Center" MinWidth="8"
CaretBrush="{TemplateBinding CaretBrush}" VerticalAlignment="Center"
Cursor="IBeam" CaretBrush="{TemplateBinding CaretBrush}"
SelectionBrush="{TemplateBinding SelectionBrush}" Cursor="IBeam"
SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}" SelectionBrush="{TemplateBinding SelectionBrush}"
TextAlignment="{TemplateBinding TextAlignment}"/> SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
<Panel Name="{x:Static u:TimeBox.PART_HourDragPanel}" TextAlignment="{TemplateBinding TextAlignment}" />
HorizontalAlignment="Stretch" <Panel
VerticalAlignment="Stretch" Name="{x:Static u:TimeBox.PART_HourDragPanel}"
Background="Transparent"/> HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Background="Transparent" />
</Grid> </Grid>
</Border> </Border>
<TextBlock <TextBlock
@@ -55,25 +61,28 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Focusable="False" Focusable="False"
Text=":" /> Text=":" />
<Border Name="{x:Static u:TimeBox.PART_MinuteBorder}" <Border
Grid.Column="2" Name="{x:Static u:TimeBox.PART_MinuteBorder}"
Background="Transparent" Grid.Column="2"
BorderBrush="Transparent" Background="Transparent"
BorderThickness="0" BorderBrush="Transparent"
CornerRadius="{TemplateBinding CornerRadius}"> BorderThickness="0"
CornerRadius="{TemplateBinding CornerRadius}">
<Grid> <Grid>
<TextPresenter Name="{x:Static u:TimeBox.PART_MinuteTextPresenter}" <TextPresenter
MinWidth="8" Name="{x:Static u:TimeBox.PART_MinuteTextPresenter}"
VerticalAlignment="Center" MinWidth="8"
CaretBrush="{TemplateBinding CaretBrush}" VerticalAlignment="Center"
Cursor="IBeam" CaretBrush="{TemplateBinding CaretBrush}"
SelectionBrush="{TemplateBinding SelectionBrush}" Cursor="IBeam"
SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}" SelectionBrush="{TemplateBinding SelectionBrush}"
TextAlignment="{TemplateBinding TextAlignment}"/> SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
<Panel Name="{x:Static u:TimeBox.PART_MinuteDragPanel}" TextAlignment="{TemplateBinding TextAlignment}" />
HorizontalAlignment="Stretch" <Panel
VerticalAlignment="Stretch" Name="{x:Static u:TimeBox.PART_MinuteDragPanel}"
Background="Transparent"/> HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Background="Transparent" />
</Grid> </Grid>
</Border> </Border>
<TextBlock <TextBlock
@@ -82,25 +91,28 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Focusable="False" Focusable="False"
Text=":" /> Text=":" />
<Border Name="{x:Static u:TimeBox.PART_SecondBorder}" <Border
Grid.Column="4" Name="{x:Static u:TimeBox.PART_SecondBorder}"
Background="Transparent" Grid.Column="4"
BorderBrush="Transparent" Background="Transparent"
BorderThickness="0" BorderBrush="Transparent"
CornerRadius="{TemplateBinding CornerRadius}"> BorderThickness="0"
CornerRadius="{TemplateBinding CornerRadius}">
<Grid> <Grid>
<TextPresenter Name="{x:Static u:TimeBox.PART_SecondTextPresenter}" <TextPresenter
MinWidth="8" Name="{x:Static u:TimeBox.PART_SecondTextPresenter}"
VerticalAlignment="Center" MinWidth="8"
CaretBrush="{TemplateBinding CaretBrush}" VerticalAlignment="Center"
Cursor="IBeam" CaretBrush="{TemplateBinding CaretBrush}"
SelectionBrush="{TemplateBinding SelectionBrush}" Cursor="IBeam"
SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}" SelectionBrush="{TemplateBinding SelectionBrush}"
TextAlignment="{TemplateBinding TextAlignment}"/> SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
<Panel Name="{x:Static u:TimeBox.PART_SecondDragPanel}" TextAlignment="{TemplateBinding TextAlignment}" />
HorizontalAlignment="Stretch" <Panel
VerticalAlignment="Stretch" Name="{x:Static u:TimeBox.PART_SecondDragPanel}"
Background="Transparent"/> HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Background="Transparent" />
</Grid> </Grid>
</Border> </Border>
<TextBlock <TextBlock
@@ -109,25 +121,28 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Focusable="False" Focusable="False"
Text="." /> Text="." />
<Border Name="{x:Static u:TimeBox.PART_MilliSecondBorder}" <Border
Grid.Column="6" Name="{x:Static u:TimeBox.PART_MilliSecondBorder}"
Background="Transparent" Grid.Column="6"
BorderBrush="Transparent" Background="Transparent"
BorderThickness="0" BorderBrush="Transparent"
CornerRadius="{TemplateBinding CornerRadius}"> BorderThickness="0"
CornerRadius="{TemplateBinding CornerRadius}">
<Grid> <Grid>
<TextPresenter Name="{x:Static u:TimeBox.PART_MillisecondTextPresenter}" <TextPresenter
MinWidth="8" Name="{x:Static u:TimeBox.PART_MillisecondTextPresenter}"
VerticalAlignment="Center" MinWidth="8"
CaretBrush="{TemplateBinding CaretBrush}" VerticalAlignment="Center"
Cursor="IBeam" CaretBrush="{TemplateBinding CaretBrush}"
SelectionBrush="{TemplateBinding SelectionBrush}" Cursor="IBeam"
SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}" SelectionBrush="{TemplateBinding SelectionBrush}"
TextAlignment="{TemplateBinding TextAlignment}"/> SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
<Panel Name="{x:Static u:TimeBox.PART_MilliSecondDragPanel}" TextAlignment="{TemplateBinding TextAlignment}" />
HorizontalAlignment="Stretch" <Panel
VerticalAlignment="Stretch" Name="{x:Static u:TimeBox.PART_MilliSecondDragPanel}"
Background="Transparent"/> HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Background="Transparent" />
</Grid> </Grid>
</Border> </Border>
</Grid> </Grid>
@@ -135,20 +150,21 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:focus-within"> <Style Selector="^:focus-within">
<Setter Property="Border.BorderBrush" Value="{DynamicResource TimeBoxFocusBorderBrush}" /> <Setter Property="Border.BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
</Style> </Style>
<Style Selector="^:disabled"> <Style Selector="^:disabled">
<Setter Property="Background" Value="{DynamicResource TimeBoxDisabledBackground}" /> <Setter Property="Background" Value="{DynamicResource TextBoxDisabledBackground}" />
<Setter Property="Foreground" Value="{DynamicResource SemiColorDisabledText}" /> <Setter Property="Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
<Setter Property="BorderBrush" Value="{DynamicResource TextBoxDisabledBorderBrush}" />
</Style> </Style>
<Style Selector="^[DragOrientation=Horizontal]"> <Style Selector="^[DragOrientation=Horizontal]">
<Style Selector="^/template/ Panel"> <Style Selector="^/template/ Panel">
<Setter Property="Cursor" Value="SizeWestEast"/> <Setter Property="Cursor" Value="SizeWestEast" />
</Style> </Style>
</Style> </Style>
<Style Selector="^[DragOrientation=Vertical]"> <Style Selector="^[DragOrientation=Vertical]">
<Style Selector="^/template/ Panel"> <Style Selector="^/template/ Panel">
<Setter Property="Cursor" Value="SizeNorthSouth"/> <Setter Property="Cursor" Value="SizeNorthSouth" />
</Style> </Style>
</Style> </Style>
</ControlTheme> </ControlTheme>

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

@@ -18,7 +18,7 @@
<Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" /> <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" />
<Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" /> <Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" />
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}"></Setter> <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}" />
<Setter Property="BorderThickness" Value="1" /> <Setter Property="BorderThickness" Value="1" />
<Setter Property="MinHeight" Value="{DynamicResource ComboBoxDefaultHeight}" /> <Setter Property="MinHeight" Value="{DynamicResource ComboBoxDefaultHeight}" />
<Setter Property="Cursor" Value="Hand" /> <Setter Property="Cursor" Value="Hand" />
@@ -69,7 +69,7 @@
</ContentPresenter> </ContentPresenter>
<ContentPresenter <ContentPresenter
Grid.Column="2" Grid.Column="2"
Margin="0 0 8 0" Margin="0,0,8,0"
VerticalAlignment="Center" VerticalAlignment="Center"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Content="{TemplateBinding InnerRightContent}" Content="{TemplateBinding InnerRightContent}"
@@ -79,11 +79,11 @@
<Button <Button
Name="PART_ClearButton" Name="PART_ClearButton"
Grid.Column="3" Grid.Column="3"
Command="{Binding $parent[u:TreeComboBox].Clear}"
Margin="0,0,8,0" Margin="0,0,8,0"
Command="{Binding $parent[u:TreeComboBox].Clear}"
Content="{DynamicResource IconButtonClearData}"
IsVisible="False" IsVisible="False"
Theme="{DynamicResource InnerIconButton}" Theme="{DynamicResource InnerIconButton}" />
Content="{DynamicResource IconButtonClearData}" />
<PathIcon <PathIcon
x:Name="DropDownGlyph" x:Name="DropDownGlyph"
@@ -95,8 +95,8 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Data="{DynamicResource ComboBoxIcon}" Data="{DynamicResource ComboBoxIcon}"
Foreground="{DynamicResource ComboBoxIconDefaultForeground}" Foreground="{DynamicResource ComboBoxIconDefaultForeground}"
UseLayoutRounding="False" IsHitTestVisible="True"
IsHitTestVisible="True" /> UseLayoutRounding="False" />
<Popup <Popup
Name="{x:Static iri:PartNames.PART_Popup}" Name="{x:Static iri:PartNames.PART_Popup}"
@@ -112,27 +112,27 @@
<Border <Border
Name="PopupBorder" Name="PopupBorder"
Margin="0,4" Margin="0,4"
BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}"
Background="{DynamicResource ComboBoxPopupBackground}" Background="{DynamicResource ComboBoxPopupBackground}"
BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}" BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}"
BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}" BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}"
ClipToBounds="True" ClipToBounds="True"
CornerRadius="6"> CornerRadius="6">
<DockPanel LastChildFill="True"> <DockPanel LastChildFill="True">
<ContentPresenter <ContentPresenter
Name="PART_PopupHeader" Name="PART_PopupHeader"
Margin="8,8 8 0" Margin="8,8,8,0"
IsVisible="{TemplateBinding PopupInnerTopContent,
Converter={x:Static ObjectConverters.IsNotNull}}"
Content="{TemplateBinding PopupInnerTopContent}" Content="{TemplateBinding PopupInnerTopContent}"
DockPanel.Dock="Top" /> DockPanel.Dock="Top"
IsVisible="{TemplateBinding PopupInnerTopContent,
Converter={x:Static ObjectConverters.IsNotNull}}" />
<ContentPresenter <ContentPresenter
Name="PART_PopupFooter" Name="PART_PopupFooter"
Margin="8 0 8 8" Margin="8,0,8,8"
IsVisible="{TemplateBinding PopupInnerBottomContent,
Converter={x:Static ObjectConverters.IsNotNull}}"
Content="{TemplateBinding PopupInnerBottomContent}" Content="{TemplateBinding PopupInnerBottomContent}"
DockPanel.Dock="Bottom" /> DockPanel.Dock="Bottom"
IsVisible="{TemplateBinding PopupInnerBottomContent,
Converter={x:Static ObjectConverters.IsNotNull}}" />
<ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"> <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}">
<ItemsPresenter ItemsPanel="{TemplateBinding ItemsPanel}" /> <ItemsPresenter ItemsPanel="{TemplateBinding ItemsPanel}" />
</ScrollViewer> </ScrollViewer>
@@ -142,23 +142,23 @@
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^.clearButton, ^.ClearButton"> <Style Selector="^.clearButton, ^.ClearButton">
<Style Selector="^:pointerover /template/ Button#PART_ClearButton"> <Style Selector="^:pointerover /template/ Button#PART_ClearButton">
<Setter Property="IsVisible" Value="{Binding $parent[u:TreeComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNotNull}}"/> <Setter Property="IsVisible" Value="{Binding $parent[u:TreeComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNotNull}}" />
</Style> </Style>
<Style Selector="^:pointerover /template/ PathIcon#DropDownGlyph"> <Style Selector="^:pointerover /template/ PathIcon#DropDownGlyph">
<Setter Property="IsVisible" Value="{Binding $parent[u:TreeComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNull}}"/> <Setter Property="IsVisible" Value="{Binding $parent[u:TreeComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNull}}" />
</Style> </Style>
</Style> </Style>
<Style Selector="^.Large"> <Style Selector="^.Large">
<Setter Property="MinHeight" Value="{DynamicResource ComboBoxLargeHeight}"/> <Setter Property="MinHeight" Value="{DynamicResource ComboBoxLargeHeight}" />
</Style> </Style>
<Style Selector="^.Small"> <Style Selector="^.Small">
<Setter Property="MinHeight" Value="{DynamicResource ComboBoxSmallHeight}"/> <Setter Property="MinHeight" Value="{DynamicResource ComboBoxSmallHeight}" />
</Style> </Style>
<!-- Pointerover State --> <!-- Pointerover State -->
<Style Selector="^:pointerover"> <Style Selector="^:pointerover">
<Setter Property="Background" Value="{DynamicResource ComboBoxSelectorPointeroverBackground}" /> <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorPointeroverBackground}" />
@@ -218,7 +218,7 @@
<Setter Property="Background" Value="{DynamicResource TreeViewItemDefaultBackground}" /> <Setter Property="Background" Value="{DynamicResource TreeViewItemDefaultBackground}" />
<Setter Property="Foreground" Value="{DynamicResource TreeViewItemDefaultForeground}" /> <Setter Property="Foreground" Value="{DynamicResource TreeViewItemDefaultForeground}" />
<Setter Property="CornerRadius" Value="3" /> <Setter Property="CornerRadius" Value="3" />
<Setter Property="MinHeight" Value="32"></Setter> <Setter Property="MinHeight" Value="32" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:TreeComboBoxItem"> <ControlTemplate TargetType="u:TreeComboBoxItem">
@@ -266,11 +266,10 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<!-- Pointerover state -->
<Style Selector="^ /template/ Border#PART_LayoutRoot:pointerover"> <Style Selector="^ /template/ Border#PART_LayoutRoot:pointerover">
<Setter Property="Background" Value="{DynamicResource TreeViewItemPointeroverBackground}" /> <Setter Property="Background" Value="{DynamicResource TreeViewItemPointeroverBackground}" />
</Style> </Style>
<!-- Pressed state --> <!-- Pressed state -->
<Style Selector="^:pressed /template/ Border#PART_LayoutRoot:pointerover"> <Style Selector="^:pressed /template/ Border#PART_LayoutRoot:pointerover">
<Setter Property="Background" Value="{DynamicResource TreeViewItemPressedBackground}" /> <Setter Property="Background" Value="{DynamicResource TreeViewItemPressedBackground}" />
@@ -288,6 +287,12 @@
<Style Selector="^:selected /template/ Border#PART_LayoutRoot"> <Style Selector="^:selected /template/ Border#PART_LayoutRoot">
<Setter Property="Background" Value="{DynamicResource TreeViewItemSelectedBackground}" /> <Setter Property="Background" Value="{DynamicResource TreeViewItemSelectedBackground}" />
</Style> </Style>
<Style Selector="^:selected /template/ ContentPresenter#PART_HeaderPresenter">
<Setter Property="Foreground" Value="{DynamicResource TreeViewItemSelectedForeground}" />
</Style>
<Style Selector="^:selected /template/ ToggleButton#PART_ExpandCollapseChevron">
<Setter Property="Foreground" Value="{DynamicResource TreeViewItemSelectedForeground}" />
</Style>
<!-- Disabled Selected state --> <!-- Disabled Selected state -->
<Style Selector="^:disabled:selected /template/ Border#PART_LayoutRoot"> <Style Selector="^:disabled:selected /template/ Border#PART_LayoutRoot">

1
src/Ursa.Themes.Semi/Controls/_index.axaml
View File

@@ -41,7 +41,6 @@
<ResourceInclude Source="ScrollToButton.axaml" /> <ResourceInclude Source="ScrollToButton.axaml" />
<ResourceInclude Source="SelectionList.axaml" /> <ResourceInclude Source="SelectionList.axaml" />
<ResourceInclude Source="TagInput.axaml" /> <ResourceInclude Source="TagInput.axaml" />
<ResourceInclude Source="TextBox.axaml" />
<ResourceInclude Source="ThemeSelector.axaml" /> <ResourceInclude Source="ThemeSelector.axaml" />
<ResourceInclude Source="TimePicker.axaml" /> <ResourceInclude Source="TimePicker.axaml" />
<ResourceInclude Source="TimeRangePicker.axaml" /> <ResourceInclude Source="TimeRangePicker.axaml" />

5
src/Ursa.Themes.Semi/Themes/Dark/SelectionList.axaml Normal file
View File

@@ -0,0 +1,5 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<SolidColorBrush x:Key="SelectionListIndicatorBackground" Color="#FF0A4694"></SolidColorBrush>
</ResourceDictionary>

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

@@ -1,4 +1,6 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here --> <!-- Add Resources Here -->
<SolidColorBrush x:Key="ClosableTagBackground" Opacity="0.15" Color="#888D92" /> <SolidColorBrush x:Key="ClosableTagBackground" Opacity="0.15" Color="#888D92" />
<SolidColorBrush x:Key="ClosableTagForeground" Color="#E6E8EA"/>
<SolidColorBrush x:Key="ClosableTagBorder" Opacity="0.08" Color="White"/>
</ResourceDictionary> </ResourceDictionary>

12
src/Ursa.Themes.Semi/Themes/Dark/TimeBox.axaml
View File

@@ -1,12 +0,0 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<SolidColorBrush x:Key="TimeBoxBackground" Opacity="0.12" Color="White" />
<SolidColorBrush x:Key="TimeBoxPointeroverBackground" Opacity="0.16" Color="White" />
<SolidColorBrush x:Key="TimeBoxPressedBackground" Opacity="0.2" Color="White" />
<SolidColorBrush x:Key="TimeBoxBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="TimeBoxDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
<SolidColorBrush x:Key="TimeBoxFocusBorderBrush" Color="#FF54A9FF" />
<SolidColorBrush x:Key="TimeBoxSelectionBrush" Color="#FF54A9FF" />
<SolidColorBrush x:Key="TimeBoxSelectionForeground" Color="White" />
<SolidColorBrush x:Key="TimeBoxCaretBrush" Color="White" />
</ResourceDictionary>

36
src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
View File

@@ -1,22 +1,22 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<MergeResourceInclude Source="Avatar.axaml" /> <ResourceInclude Source="Avatar.axaml" />
<MergeResourceInclude Source="Badge.axaml" /> <ResourceInclude Source="Badge.axaml" />
<MergeResourceInclude Source="Banner.axaml" /> <ResourceInclude Source="Banner.axaml" />
<MergeResourceInclude Source="ButtonGroup.axaml" /> <ResourceInclude Source="ButtonGroup.axaml" />
<MergeResourceInclude Source="DatePicker.axaml" /> <ResourceInclude Source="DatePicker.axaml" />
<MergeResourceInclude Source="Dialog.axaml" /> <ResourceInclude Source="Dialog.axaml" />
<MergeResourceInclude Source="Divider.axaml" /> <ResourceInclude Source="Divider.axaml" />
<MergeResourceInclude Source="DualBadge.axaml" /> <ResourceInclude Source="DualBadge.axaml" />
<MergeResourceInclude Source="Loading.axaml" /> <ResourceInclude Source="Loading.axaml" />
<MergeResourceInclude Source="NavigationMenu.axaml" /> <ResourceInclude Source="NavigationMenu.axaml" />
<MergeResourceInclude Source="NotificationShared.axaml" /> <ResourceInclude Source="NotificationShared.axaml" />
<MergeResourceInclude Source="Pagination.axaml" /> <ResourceInclude Source="Pagination.axaml" />
<MergeResourceInclude Source="Rating.axaml" /> <ResourceInclude Source="Rating.axaml" />
<MergeResourceInclude Source="TagInput.axaml" /> <ResourceInclude Source="SelectionList.axaml" />
<MergeResourceInclude Source="Timeline.axaml" /> <ResourceInclude Source="TagInput.axaml" />
<MergeResourceInclude Source="Toast.axaml" /> <ResourceInclude Source="Timeline.axaml" />
<MergeResourceInclude Source="Skeleton.axaml" /> <ResourceInclude Source="Toast.axaml" />
<MergeResourceInclude Source="TimeBox.axaml" /> <ResourceInclude Source="Skeleton.axaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>

17
src/Ursa.Themes.Semi/Themes/HighContrast/Base.axaml
View File

@@ -100,4 +100,21 @@
<SolidColorBrush x:Key="DividerBorderBrush" Color="{StaticResource WindowTextColor}" /> <SolidColorBrush x:Key="DividerBorderBrush" Color="{StaticResource WindowTextColor}" />
<SolidColorBrush x:Key="NavigationMenuItemExpandIconForeground" Color="{StaticResource WindowTextColor}" /> <SolidColorBrush x:Key="NavigationMenuItemExpandIconForeground" Color="{StaticResource WindowTextColor}" />
<!-- Pagination -->
<SolidColorBrush x:Key="PaginationButtonDefaultForeground" Color="{StaticResource WindowTextColor}" />
<SolidColorBrush x:Key="PaginationButtonSelectedForeground" Color="{StaticResource HighlightTextColor}" />
<SolidColorBrush x:Key="PaginationButtonIconForeground" Color="{StaticResource WindowTextColor}" />
<SolidColorBrush x:Key="PaginationButtonDefaultBackground" Color="{StaticResource WindowColor}" />
<SolidColorBrush x:Key="PaginationButtonPointeroverBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="PaginationButtonPressedBackground" Color="{StaticResource HighlightColor}" />
<SolidColorBrush x:Key="PaginationButtonSelectedBackground" Color="{DynamicResource HighlightColor}" />
<!-- SelectionList -->
<SolidColorBrush x:Key="SelectionListIndicatorBackground" Color="{StaticResource WindowColor}" />
<!-- Tag -->
<SolidColorBrush x:Key="ClosableTagBackground" Color="{StaticResource WindowColor}" />
<SolidColorBrush x:Key="ClosableTagForeground" Color="{StaticResource WindowTextColor}" />
<SolidColorBrush x:Key="ClosableTagBorder" Color="{StaticResource WindowTextColor}" />
</ResourceDictionary> </ResourceDictionary>

5
src/Ursa.Themes.Semi/Themes/Light/SelectionList.axaml Normal file
View File

@@ -0,0 +1,5 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<SolidColorBrush x:Key="SelectionListIndicatorBackground" Color="#FFCBE7FE"></SolidColorBrush>
</ResourceDictionary>

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

@@ -1,4 +1,6 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here --> <!-- Add Resources Here -->
<SolidColorBrush x:Key="ClosableTagBackground" Color="White" /> <SolidColorBrush x:Key="ClosableTagBackground" Color="White" />
<SolidColorBrush x:Key="ClosableTagForeground" Color="#2E3238"/>
<SolidColorBrush x:Key="ClosableTagBorder" Opacity="0.08" Color="#1C1F23"/>
</ResourceDictionary> </ResourceDictionary>

12
src/Ursa.Themes.Semi/Themes/Light/TimeBox.axaml
View File

@@ -1,12 +0,0 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<SolidColorBrush x:Key="TimeBoxBackground" Opacity="0.05" Color="#FF2E3238" />
<SolidColorBrush x:Key="TimeBoxPointeroverBackground" Opacity="0.09" Color="#FF2E3238" />
<SolidColorBrush x:Key="TimeBoxPressedBackground" Opacity="0.13" Color="#FF2E3238" />
<SolidColorBrush x:Key="TimeBoxBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="TimeBoxDisabledBackground" Opacity="0.02" Color="#2E3238" />
<SolidColorBrush x:Key="TimeBoxFocusBorderBrush" Color="#FF0077FA" />
<SolidColorBrush x:Key="TimeBoxSelectionBrush" Color="#FF0077FA" />
<SolidColorBrush x:Key="TimeBoxSelectionForeground" Color="White" />
<SolidColorBrush x:Key="TimeBoxCaretBrush" Color="Black" />
</ResourceDictionary>

2
src/Ursa.Themes.Semi/Themes/Light/_index.axaml
View File

@@ -13,10 +13,10 @@
<ResourceInclude Source="NotificationShared.axaml" /> <ResourceInclude Source="NotificationShared.axaml" />
<ResourceInclude Source="Pagination.axaml" /> <ResourceInclude Source="Pagination.axaml" />
<ResourceInclude Source="Rating.axaml" /> <ResourceInclude Source="Rating.axaml" />
<ResourceInclude Source="SelectionList.axaml" />
<ResourceInclude Source="TagInput.axaml" /> <ResourceInclude Source="TagInput.axaml" />
<ResourceInclude Source="Timeline.axaml" /> <ResourceInclude Source="Timeline.axaml" />
<ResourceInclude Source="Toast.axaml" /> <ResourceInclude Source="Toast.axaml" />
<ResourceInclude Source="Skeleton.axaml" /> <ResourceInclude Source="Skeleton.axaml" />
<ResourceInclude Source="TimeBox.axaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>

1
src/Ursa.Themes.Semi/Themes/Shared/TagInput.axaml
View File

@@ -1,5 +1,4 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here --> <!-- Add Resources Here -->
<StreamGeometry x:Key="ClosableTagCloseIconGlyph">M17.6568 19.7782C18.2426 20.3639 19.1924 20.3639 19.7782 19.7782C20.3639 19.1924 20.3639 18.2426 19.7782 17.6568L14.1213 12L19.7782 6.34313C20.3639 5.75734 20.3639 4.8076 19.7782 4.22181C19.1924 3.63602 18.2426 3.63602 17.6568 4.22181L12 9.87866L6.34313 4.22181C5.75734 3.63602 4.8076 3.63602 4.22181 4.22181C3.63602 4.8076 3.63602 5.75734 4.22181 6.34313L9.87866 12L4.22181 17.6568C3.63602 18.2426 3.63602 19.1924 4.22181 19.7782C4.8076 20.3639 5.75734 20.3639 6.34313 19.7782L12 14.1213L17.6568 19.7782Z</StreamGeometry> <StreamGeometry x:Key="ClosableTagCloseIconGlyph">M17.6568 19.7782C18.2426 20.3639 19.1924 20.3639 19.7782 19.7782C20.3639 19.1924 20.3639 18.2426 19.7782 17.6568L14.1213 12L19.7782 6.34313C20.3639 5.75734 20.3639 4.8076 19.7782 4.22181C19.1924 3.63602 18.2426 3.63602 17.6568 4.22181L12 9.87866L6.34313 4.22181C5.75734 3.63602 4.8076 3.63602 4.22181 4.22181C3.63602 4.8076 3.63602 5.75734 4.22181 6.34313L9.87866 12L4.22181 17.6568C3.63602 18.2426 3.63602 19.1924 4.22181 19.7782C4.8076 20.3639 5.75734 20.3639 6.34313 19.7782L12 14.1213L17.6568 19.7782Z</StreamGeometry>
<x:Double x:Key="TagInputDefaultHeight">32</x:Double>
</ResourceDictionary> </ResourceDictionary>

8
src/Ursa.Themes.Semi/Themes/Shared/TimeBox.axaml
View File

@@ -1,8 +0,0 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<x:Double x:Key="TimeBoxDefaultMinHeight">32</x:Double>
<x:Double x:Key="TimeBoxSmallMinHeight">24</x:Double>
<x:Double x:Key="TimeBoxLargeMinHeight">40</x:Double>
<Thickness x:Key="TimeBoxBorderThickness">1</Thickness>
<CornerRadius x:Key="TimeBoxCornerRadius">3</CornerRadius>
</ResourceDictionary>

1
src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
View File

@@ -23,6 +23,5 @@
<ResourceInclude Source="ThemeSelector.axaml" /> <ResourceInclude Source="ThemeSelector.axaml" />
<ResourceInclude Source="Toast.axaml" /> <ResourceInclude Source="Toast.axaml" />
<ResourceInclude Source="ToolBar.axaml" /> <ResourceInclude Source="ToolBar.axaml" />
<ResourceInclude Source="TimeBox.axaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>