DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-12 13:28:33 +00:00
Code Issues Releases Wiki Activity

UI - Fix visual regressions that occured after updating Avalonia at some point

Browse Source
This commit is contained in:
Robert 2025-02-14 19:02:56 +01:00
parent cfdcbe44c9
commit 14c7940a21
6 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputView.axaml
View File

@ -10,7 +10,7 @@
x:DataType="propertyInput:BrushPropertyInputViewModel">
<UserControl.Styles>
<Style Selector="ComboBox.brush /template/ ContentControl#ContentPresenter">
<Style Selector="ComboBox.brush /template/ ContentPresenter#ContentPresenter">
<Setter Property="ContentTemplate">
<Setter.Value>
<DataTemplate DataType="{x:Type layerBrushes:LayerBrushDescriptor}">

2
src/Artemis.UI/Screens/Device/Tabs/Layout/DeviceLayoutTabView.axaml
View File

@ -65,7 +65,7 @@
</StackPanel>
<StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center">
<StackPanel.Styles>
<Style Selector="ComboBox.layoutProvider /template/ ContentControl#ContentPresenter">
<Style Selector="ComboBox.layoutProvider /template/ ContentPresenter#ContentPresenter">
<Setter Property="ContentTemplate">
<Setter.Value>
<DataTemplate x:DataType="layoutProviders:ILayoutProviderViewModel">

2
src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutView.axaml
View File

@ -17,7 +17,7 @@
</StackPanel>
<StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Spacing="5">
<StackPanel.Styles>
<Style Selector="ComboBox.layoutProvider /template/ ContentControl#ContentPresenter">
<Style Selector="ComboBox.layoutProvider /template/ ContentPresenter#ContentPresenter">
<Setter Property="ContentTemplate">
<Setter.Value>
<DataTemplate x:DataType="models:InstalledEntry">

8
src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptView.axaml
View File

@ -7,7 +7,7 @@
x:Class="Artemis.UI.Screens.ProfileEditor.DisplayCondition.DisplayConditionScriptView"
x:DataType="displayCondition:DisplayConditionScriptViewModel">
<UserControl.Styles>
<Style Selector="ComboBox.condition-type /template/ ContentControl#ContentPresenter">
<Style Selector="ComboBox.condition-type /template/ ContentPresenter#ContentPresenter">
<Setter Property="ContentTemplate">
<Setter.Value>
<DataTemplate DataType="{x:Type displayCondition:ConditionTypeViewModel}">
@ -35,7 +35,13 @@
<TextBlock Text="{CompiledBinding Description}" Foreground="{DynamicResource TextFillColorSecondaryBrush}" TextWrapping="Wrap" MaxWidth="350" />
</StackPanel>
</DataTemplate>
</ComboBox.ItemTemplate>
<ComboBox.SelectionBoxItemTemplate>
<DataTemplate DataType="{x:Type displayCondition:ConditionTypeViewModel}">
<TextBlock Text="{CompiledBinding Name}" TextWrapping="Wrap" MaxWidth="350" />
</DataTemplate>
</ComboBox.SelectionBoxItemTemplate>
</ComboBox>
<ContentControl Grid.Row="2" Content="{CompiledBinding ConditionViewModel}" />
</Grid>

2
src/Artemis.UI/Screens/Settings/Tabs/GeneralTabView.axaml
View File

@ -267,7 +267,7 @@
</StackPanel>
<StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
<StackPanel.Styles>
<Style Selector="ComboBox.brush /template/ ContentControl#ContentPresenter">
<Style Selector="ComboBox.brush /template/ ContentPresenter#ContentPresenter">
<Setter Property="ContentTemplate">
<Setter.Value>
<DataTemplate DataType="{x:Type layerBrushes:LayerBrushDescriptor}">

8
src/Artemis.UI/Styles/Artemis.axaml
View File

@ -38,6 +38,14 @@
<Setter Property="VerticalScrollBarVisibility" Value="Disabled"></Setter>
</Style>
<!-- Workaround for https://github.com/amwx/FluentAvalonia/issues/648 -->
<Style Selector="controls|FontIcon">
<Setter Property="Width" Value="24" />
</Style>
<Style Selector="controls|SymbolIcon">
<Setter Property="Width" Value="24" />
</Style>
<Styles.Resources>
<ResourceDictionary>
<FontFamily x:Key="RobotoMono">avares://Artemis.UI/Assets/Fonts#Roboto Mono</FontFamily>