DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-31 09:43:46 +00:00
Code Issues Releases Wiki Activity

Display conditions - Show affix/prefix in static input

Browse Source
This commit is contained in:
SpoinkyNL 2020-07-08 22:36:24 +02:00
parent 92dfbb354a
commit e2cfac1437
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelPropertiesViewModel.cs
View File

@ -22,9 +22,7 @@ namespace Artemis.UI.Shared.DataModelVisualization.Shared
{ {
return Parent.IsRootViewModel ? DataModel : base.GetCurrentValue(); return Parent.IsRootViewModel ? DataModel : base.GetCurrentValue();
} }
private void PopulateProperties(IDataModelVisualizationService dataModelVisualizationService) private void PopulateProperties(IDataModelVisualizationService dataModelVisualizationService)
{ {
if (Children.Any()) if (Children.Any())

4
src/Artemis.UI.Shared/DataModelVisualization/Shared/DataModelVisualizationViewModel.cs
View File

@ -180,6 +180,10 @@ namespace Artemis.UI.Shared.DataModelVisualization.Shared
new DataModelPropertyAttribute {Name = PropertyInfo.Name.Humanize()}; new DataModelPropertyAttribute {Name = PropertyInfo.Name.Humanize()};
else else
throw new ArtemisSharedUIException("Failed to get property description because plugin info is null but the parent has a datamodel"); throw new ArtemisSharedUIException("Failed to get property description because plugin info is null but the parent has a datamodel");
// If a property description was provided but the name is null, use the humanized property name
if (PropertyDescription != null && PropertyDescription.Name == null && PropertyInfo != null)
PropertyDescription.Name = PropertyInfo.Name.Humanize();
} }
} }
} }

14
src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml
View File

@ -147,8 +147,18 @@
Command="{s:Action ActivateRightSideInputViewModel}" Command="{s:Action ActivateRightSideInputViewModel}"
HorizontalAlignment="Left"> HorizontalAlignment="Left">
<Grid> <Grid>
<TextBlock Text="{Binding DisplayConditionPredicate.RightStaticValue}" <StackPanel Visibility="{Binding DisplayConditionPredicate.RightStaticValue, Converter={StaticResource NullToVisibilityConverter}}" Orientation="Horizontal">
Visibility="{Binding DisplayConditionPredicate.RightStaticValue, Converter={StaticResource NullToVisibilityConverter}}" /> <TextBlock Margin="0 0 3 0"
FontWeight="Light"
Text="{Binding SelectedLeftSideProperty.PropertyDescription.Prefix}"
Visibility="{Binding SelectedLeftSideProperty.PropertyDescription.Prefix, Converter={StaticResource NullToVisibilityConverter}}"/>
<TextBlock Text="{Binding DisplayConditionPredicate.RightStaticValue}"/>
<TextBlock Margin="3 0 0 0"
FontWeight="Light"
Text="{Binding SelectedLeftSideProperty.PropertyDescription.Affix}"
Visibility="{Binding SelectedLeftSideProperty.PropertyDescription.Affix, Converter={StaticResource NullToVisibilityConverter}}" />
</StackPanel>
<TextBlock Text="« Enter a value »" <TextBlock Text="« Enter a value »"
FontStyle="Italic" FontStyle="Italic"
Visibility="{Binding DisplayConditionPredicate.RightStaticValue, Converter={StaticResource NullToVisibilityConverter}, ConverterParameter=Inverted}" /> Visibility="{Binding DisplayConditionPredicate.RightStaticValue, Converter={StaticResource NullToVisibilityConverter}, ConverterParameter=Inverted}" />

3
src/Plugins/Artemis.Plugins.Modules.General/GeneralDataModel.cs
View File

@ -40,6 +40,9 @@ namespace Artemis.Plugins.Modules.General
[DataModelProperty(Name = "A test boolean", Description = "This is a test boolean that's not of any use outside testing!")] [DataModelProperty(Name = "A test boolean", Description = "This is a test boolean that's not of any use outside testing!")]
public bool TestBoolean { get; set; } public bool TestBoolean { get; set; }
[DataModelProperty(Affix = "%", MinValue = 0, MaxValue = 100)]
public int Health { get; set; }
public SKPoint Position { get; set; } public SKPoint Position { get; set; }
} }
} }