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

Conditions - Removed animations that made the UI feel sluggish

Browse Source 
Profile editor - Fixed effects toggle sometimes dissapearing
Property tree - Replaced TreeView with custom implementation
Property tree - Fixed minus/plus numpad keys collapsing the tree
This commit is contained in:
Robert committed 2020-09-25 20:19:53 +02:00
1 parent fa329a9048
commit a5455c26d6
17 files changed
+430 -447
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI/Screens/ProfileEditor/Conditions/DataModelConditionGroupView.xaml
+15 -21
View File
@@ -54,22 +54,22 @@
Visibility="{Binding DisplayBooleanOperator, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}">
<Button.ContextMenu>
<ContextMenu>
<MenuItem Header="And"
Command="{s:Action SelectBooleanOperator}"
CommandParameter="And"
<MenuItem Header="And"
Command="{s:Action SelectBooleanOperator}"
CommandParameter="And"
ToolTip="All the conditions in the group should evaluate to true" />
<MenuItem Header="Or"
<MenuItem Header="Or"
Command="{s:Action SelectBooleanOperator}"
CommandParameter="Or"
ToolTip="Any of the conditions in the group should evaluate to true"/>
<MenuItem Header="And not"
Command="{s:Action SelectBooleanOperator}"
CommandParameter="AndNot"
ToolTip="All the conditions in the group should evaluate to false"/>
<MenuItem Header="Or not"
CommandParameter="Or"
ToolTip="Any of the conditions in the group should evaluate to true" />
<MenuItem Header="And not"
Command="{s:Action SelectBooleanOperator}"
CommandParameter="OrNot"
ToolTip="Any of the conditions in the group should evaluate to false"/>
CommandParameter="AndNot"
ToolTip="All the conditions in the group should evaluate to false" />
<MenuItem Header="Or not"
Command="{s:Action SelectBooleanOperator}"
CommandParameter="OrNot"
ToolTip="Any of the conditions in the group should evaluate to false" />
</ContextMenu>
</Button.ContextMenu>
</Button>
@@ -116,7 +116,7 @@
<MenuItem.Icon>
<materialDesign:PackIcon Kind="Link" />
</MenuItem.Icon>
</MenuItem>
</MenuItem>
<MenuItem Header="Add self condition"
ToolTip="A condition that compares with a property contained in the list"
Command="{s:Action AddCondition}"
@@ -149,13 +149,7 @@
<ItemsControl Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" ItemsSource="{Binding Items}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<materialDesign:TransitioningContent>
<materialDesign:TransitioningContent.OpeningEffects>
<materialDesign:TransitionEffect Kind="FadeIn" />
<materialDesign:TransitionEffect Kind="SlideInFromLeft" />
</materialDesign:TransitioningContent.OpeningEffects>
<ContentControl s:View.Model="{Binding}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsTabStop="False" />
</materialDesign:TransitioningContent>
<ContentControl s:View.Model="{Binding}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsTabStop="False" />
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
src/Artemis.UI/Screens/ProfileEditor/Conditions/DataModelConditionListView.xaml
+19 -25
View File
@@ -39,10 +39,10 @@
</Button>
<!-- Left side, the list this predicate is targeting -->
<ContentControl Grid.Row="0"
<ContentControl Grid.Row="0"
Grid.Column="1"
s:View.Model="{Binding TargetSelectionViewModel}"
VerticalContentAlignment="Stretch"
VerticalContentAlignment="Stretch"
HorizontalContentAlignment="Stretch"
IsTabStop="False" />
@@ -58,23 +58,23 @@
ToolTip="Change the list operator, determining how the list contents should match">
<Button.ContextMenu>
<ContextMenu>
<MenuItem Header="Any"
Command="{s:Action SelectListOperator}"
CommandParameter="Any"
ToolTip="Any of the list items should evaluate to true"/>
<MenuItem Header="All"
Command="{s:Action SelectListOperator}"
CommandParameter="All"
ToolTip="All of the list items should evaluate to true"/>
<MenuItem Header="None"
Command="{s:Action SelectListOperator}"
<MenuItem Header="Any"
Command="{s:Action SelectListOperator}"
CommandParameter="Any"
ToolTip="Any of the list items should evaluate to true" />
<MenuItem Header="All"
Command="{s:Action SelectListOperator}"
CommandParameter="All"
ToolTip="All of the list items should evaluate to true" />
<MenuItem Header="None"
Command="{s:Action SelectListOperator}"
CommandParameter="None"
ToolTip="None of the list items should evaluate to true"/>
<MenuItem Header="Count (NYI)"
Command="{s:Action SelectListOperator}"
CommandParameter="Count"
IsEnabled="False"
ToolTip="A specific amount of the list items should evaluate to true"/>
ToolTip="None of the list items should evaluate to true" />
<MenuItem Header="Count (NYI)"
Command="{s:Action SelectListOperator}"
CommandParameter="Count"
IsEnabled="False"
ToolTip="A specific amount of the list items should evaluate to true" />
</ContextMenu>
</Button.ContextMenu>
</Button>
@@ -82,13 +82,7 @@
<ItemsControl Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" ItemsSource="{Binding Items}" Margin="0 4 0 0">
<ItemsControl.ItemTemplate>
<DataTemplate>
<materialDesign:TransitioningContent>
<materialDesign:TransitioningContent.OpeningEffects>
<materialDesign:TransitionEffect Kind="FadeIn" />
<materialDesign:TransitionEffect Kind="SlideInFromLeft" />
</materialDesign:TransitioningContent.OpeningEffects>
<ContentControl s:View.Model="{Binding}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsTabStop="False" />
</materialDesign:TransitioningContent>
<ContentControl s:View.Model="{Binding}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsTabStop="False" />
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>