DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 03:48:56 +00:00
Code Issues Releases Wiki Activity

Workshop - Added filtering, sorting and changable entries per page

Browse Source
This commit is contained in:
Robert committed 2023-09-23 23:08:28 +02:00
1 parent aa8519b33c
commit 4994b3fb44
18 files changed
+396 -159
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI.Shared/Routing/Router/Router.cs
+2
View File
@@ -177,6 +177,8 @@ internal class Router : CorePropertyChanged, IRouter, IDisposable
_currentRouteSubject.Dispose();
_mainWindowService.MainWindowOpened -= MainWindowServiceOnMainWindowOpened;
_mainWindowService.MainWindowClosed -= MainWindowServiceOnMainWindowClosed;
_logger.Debug("Router disposed, should that be? Stacktrace: \r\n{StackTrace}", Environment.StackTrace);
}
private void MainWindowServiceOnMainWindowOpened(object? sender, EventArgs e)
src/Artemis.UI.Shared/Styles/TextBox.axaml
+36 -17
View File
@@ -45,10 +45,10 @@
</Border>
<Border Margin="{TemplateBinding BorderThickness}">
<Grid ColumnDefinitions="Auto,*,Auto" >
<Grid ColumnDefinitions="Auto,*,Auto">
<ContentPresenter Grid.Column="0"
Grid.ColumnSpan="1"
Content="{TemplateBinding InnerLeftContent}"/>
Content="{TemplateBinding InnerLeftContent}" />
<Grid x:Name="PART_InnerGrid"
Grid.Column="1"
RowDefinitions="Auto,Auto"
@@ -85,22 +85,22 @@
TextWrapping="{TemplateBinding TextWrapping}"
IsVisible="{TemplateBinding Text, Converter={x:Static StringConverters.IsNullOrEmpty}}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
<TextPresenter Name="PART_TextPresenter"
Text="{TemplateBinding Text, Mode=TwoWay}"
CaretIndex="{TemplateBinding CaretIndex}"
SelectionStart="{TemplateBinding SelectionStart}"
SelectionEnd="{TemplateBinding SelectionEnd}"
TextAlignment="{TemplateBinding TextAlignment}"
TextWrapping="{TemplateBinding TextWrapping}"
LineHeight="{TemplateBinding LineHeight}"
PasswordChar="{TemplateBinding PasswordChar}"
RevealPassword="{TemplateBinding RevealPassword}"
SelectionBrush="{TemplateBinding SelectionBrush}"
SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
CaretBrush="{TemplateBinding CaretBrush}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
Text="{TemplateBinding Text, Mode=TwoWay}"
CaretIndex="{TemplateBinding CaretIndex}"
SelectionStart="{TemplateBinding SelectionStart}"
SelectionEnd="{TemplateBinding SelectionEnd}"
TextAlignment="{TemplateBinding TextAlignment}"
TextWrapping="{TemplateBinding TextWrapping}"
LineHeight="{TemplateBinding LineHeight}"
PasswordChar="{TemplateBinding PasswordChar}"
RevealPassword="{TemplateBinding RevealPassword}"
SelectionBrush="{TemplateBinding SelectionBrush}"
SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
CaretBrush="{TemplateBinding CaretBrush}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
</Panel>
</ScrollViewer>
@@ -137,4 +137,23 @@
<Setter Property="Margin" Value="4 0 0 0"></Setter>
</Style>
<Style Selector="TextBox.search-box">
<Setter Property="VerticalAlignment" Value="Top"></Setter>
<Setter Property="InnerRightContent">
<Template>
<StackPanel Orientation="Horizontal">
<Button Content="&#xE8BB;"
FontFamily="{StaticResource SymbolThemeFontFamily}"
Theme="{StaticResource TransparentButton}"
Command="{CompiledBinding $parent[TextBox].Clear}"
IsVisible="{CompiledBinding Text, RelativeSource={RelativeSource FindAncestor, AncestorType=TextBox}, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
<Button Content="&#xE721;"
FontFamily="{StaticResource SymbolThemeFontFamily}"
Theme="{StaticResource TransparentButton}"
Command="{CompiledBinding $parent[TextBox].Clear}"
IsHitTestVisible="False" />
</StackPanel>
</Template>
</Setter>
</Style>
</Styles>