dan/Walleby
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve vault navifaiton

Browse Source
This commit is contained in:
TheXamlGuy
2024-05-05 17:41:38 +01:00
parent bfc495af4e
commit a49e2a8fae
15 changed files with 116 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Bitvault.Avalonia/AllNavigationView.axaml
+8 -1
View File
@@ -8,7 +8,14 @@
IsSelected="{Binding Selected, Mode=TwoWay}">
<Interaction.Behaviors>
<DataTriggerBehavior Binding="{Binding Selected}" Value="True">
<InvokeCommandAction Command="{Binding InvokeCommand}" />
<ConditionAction>
<ConditionAction.Condition>
<ConditionalExpression ForwardChaining="And">
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Context="Main" Route="Vault" />
</ConditionAction>
</DataTriggerBehavior>
</Interaction.Behaviors>
</NavigationViewItem>
Bitvault.Avalonia/ArchiveNavigationView.axaml
+8 -1
View File
@@ -8,7 +8,14 @@
IsSelected="{Binding Selected, Mode=TwoWay}">
<Interaction.Behaviors>
<DataTriggerBehavior Binding="{Binding Selected}" Value="True">
<InvokeCommandAction Command="{Binding InvokeCommand}" />
<ConditionAction>
<ConditionAction.Condition>
<ConditionalExpression ForwardChaining="And">
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Context="Main" Route="Vault" />
</ConditionAction>
</DataTriggerBehavior>
</Interaction.Behaviors>
</NavigationViewItem>
Bitvault.Avalonia/StarredNavigationView.axaml
+8 -1
View File
@@ -8,7 +8,14 @@
IsSelected="{Binding Selected, Mode=TwoWay}">
<Interaction.Behaviors>
<DataTriggerBehavior Binding="{Binding Selected}" Value="True">
<InvokeCommandAction Command="{Binding InvokeCommand}" />
<ConditionAction>
<ConditionAction.Condition>
<ConditionalExpression ForwardChaining="And">
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Context="Main" Route="Vault" />
</ConditionAction>
</DataTriggerBehavior>
</Interaction.Behaviors>
</NavigationViewItem>
Bitvault.Avalonia/VaultNavigationView.axaml
+4 -5
View File
@@ -6,7 +6,7 @@
x:Name="NavigationViewItem"
x:DataType="vm:VaultNavigationViewModel"
Content="{Binding Name}"
IsExpanded="{Binding Expanded, Mode=TwoWay}"
IsExpanded="{Binding Expanded}"
IsSelected="{Binding Selected}"
MenuItemsSource="{Binding}"
NavigationViewItemExtension.IsItemClickEnabled="True"
@@ -38,7 +38,7 @@
PropertyName="SelectsOnInvoked"
TargetObject="{Binding #NavigationViewItem}"
Value="False" />
<SelectNavigationViewItemAction />
<InvokeNavigationViewItemAction />
</ConditionAction>
</DataTriggerBehavior>
<AttachedEventTriggerBehaviour RoutedEvent="{x:Static NavigationViewItemExtension.ItemClickEvent}">
@@ -46,7 +46,6 @@
<ConditionAction.Condition>
<ConditionalExpression ForwardChaining="And">
<ComparisonCondition LeftOperand="{Binding Opened}" RightOperand="False" />
<ComparisonCondition LeftOperand="{Binding #NavigationViewItem.IsChildSelected}" RightOperand="False" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Context="Main" Route="OpenVault" />
@@ -55,11 +54,11 @@
<ConditionAction.Condition>
<ConditionalExpression ForwardChaining="And">
<ComparisonCondition LeftOperand="{Binding Opened}" RightOperand="True" />
<ComparisonCondition LeftOperand="{Binding #NavigationViewItem.IsChildSelected}" RightOperand="False" />
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Context="Main" Route="Vault" />
<SelectNavigationViewItemAction />
<InvokeNavigationViewItemAction />
</ConditionAction>
</AttachedEventTriggerBehaviour>
</Interaction.Behaviors>
Bitvault.Avalonia/VaultView.axaml
-8
View File
@@ -35,13 +35,5 @@
ItemTemplate="{ReflectionBinding Template}"
ItemsSource="{Binding}" />
</Grid>
<GridSplitter Grid.Column="1" Background="Transparent" />
<Rectangle
Grid.Column="1"
Width="1"
HorizontalAlignment="Center"
Fill="{DynamicResource DividerStrokeColorDefaultBrush}"
IsHitTestVisible="False" />
<Frame Grid.Row="1" Grid.Column="2" />
</Grid>
</UserControl>