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

Merge remote-tracking branch 'origin/development' into development

Browse Source
This commit is contained in:
Robert 2021-03-25 20:49:08 +01:00
commit 0a7c724de0
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Artemis.UI/DefaultTypes/PropertyInput/FloatPropertyInputView.xaml
View File

@ -6,6 +6,7 @@
xmlns:s="https://github.com/canton7/Stylet" xmlns:s="https://github.com/canton7/Stylet"
xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared" xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:propertyInput="clr-namespace:Artemis.UI.DefaultTypes.PropertyInput"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800" d:DesignHeight="450" d:DesignWidth="800"
d:DataContext="{d:DesignInstance propertyInput:FloatPropertyInputViewModel}"> d:DataContext="{d:DesignInstance propertyInput:FloatPropertyInputViewModel}">

2
src/Artemis.UI/Screens/ProfileEditor/Conditions/DataModelConditionGroupView.xaml
View File

@ -154,7 +154,7 @@
</materialDesign:ToggleButtonAssist.OnContent> </materialDesign:ToggleButtonAssist.OnContent>
</ToggleButton> </ToggleButton>
<ItemsControl Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" ItemsSource="{Binding Items, IsAsync=True}" Margin="0 3 0 0"> <ItemsControl Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" ItemsSource="{Binding Items}" Margin="0 3 0 0">
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate> <DataTemplate>
<ContentControl s:View.Model="{Binding}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsTabStop="False" /> <ContentControl s:View.Model="{Binding}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsTabStop="False" />

14
src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyView.xaml
View File

@ -70,16 +70,10 @@
ToolTip="{Binding LayerProperty.PropertyDescription.Description}" ToolTip="{Binding LayerProperty.PropertyDescription.Description}"
HorizontalAlignment="Left" /> HorizontalAlignment="Left" />
<ContentControl Grid.Column="2" Margin="5 0" s:View.Model="{Binding PropertyInputViewModel, IsAsync=True}" ToolTip="{Binding LayerProperty.PropertyDescription.Description}"> <ContentControl Grid.Column="2"
<ContentControl.Resources> Margin="5 0"
<Style TargetType="TextBlock"> s:View.Model="{Binding PropertyInputViewModel, IsAsync=True}"
<Setter Property="Margin" Value="0 0 5 4" /> ToolTip="{Binding LayerProperty.PropertyDescription.Description}"/>
<Setter Property="VerticalAlignment" Value="Bottom" />
<Setter Property="FontSize" Value="11" />
<Setter Property="FontWeight" Value="Light" />
</Style>
</ContentControl.Resources>
</ContentControl>
<Button Grid.Column="3" <Button Grid.Column="3"
Command="{s:Action ResetToDefault}" Command="{s:Action ResetToDefault}"