|
65 | 65 | <RowDefinition Height="*" /> |
66 | 66 | </Grid.RowDefinitions> |
67 | 67 |
|
68 | | - <Border x:Name="PaneLeftLoader" Grid.Row="1"> |
69 | | - <local:ModernShellPage |
70 | | - x:Name="PaneLeft" |
71 | | - ContentChanged="Pane_ContentChanged" |
72 | | - CurrentInstanceBorderThickness="0,0,0,2" |
73 | | - IsPageMainPane="True" |
74 | | - Loaded="PaneLeft_Loaded" |
75 | | - NavParams="{x:Bind NavParamsLeft, Mode=OneWay}" |
76 | | - PaneHolder="{x:Bind}" /> |
77 | | - </Border> |
| 68 | + <local:ModernShellPage |
| 69 | + x:Name="PaneLeft" |
| 70 | + Grid.Row="1" |
| 71 | + BorderBrush="{ThemeResource ControlStrokeColorDefault}" |
| 72 | + ContentChanged="Pane_ContentChanged" |
| 73 | + CurrentInstanceBorderThickness="0,0,0,1" |
| 74 | + IsPageMainPane="True" |
| 75 | + Loaded="PaneLeft_Loaded" |
| 76 | + NavParams="{x:Bind NavParamsLeft, Mode=OneWay}" |
| 77 | + PaneHolder="{x:Bind}" /> |
78 | 78 |
|
79 | | - <Border |
80 | | - x:Name="PaneRightLoader" |
| 79 | + <local:ModernShellPage |
| 80 | + x:Name="PaneRight" |
81 | 81 | Grid.Row="1" |
82 | 82 | Grid.Column="1" |
83 | 83 | x:Load="{x:Bind IsRightPaneVisible, Mode=OneWay}" |
84 | | - BorderBrush="{ThemeResource PaneBorderBrush}" |
85 | | - BorderThickness="2,0,0,0"> |
86 | | - |
87 | | - <local:ModernShellPage |
88 | | - x:Name="PaneRight" |
89 | | - ContentChanged="Pane_ContentChanged" |
90 | | - CurrentInstanceBorderThickness="0,0,0,2" |
91 | | - IsPageMainPane="False" |
92 | | - Loaded="PaneRight_Loaded" |
93 | | - NavParams="{x:Bind NavParamsRight, Mode=OneWay}" |
94 | | - PaneHolder="{x:Bind}" /> |
95 | | - |
96 | | - <animations:Implicit.ShowAnimations> |
97 | | - <animations:ScalarAnimation |
98 | | - Target="Translation.X" |
99 | | - From="300" |
100 | | - To="0" |
101 | | - Duration="0:0:0.2" /> |
102 | | - <animations:ScalarAnimation |
103 | | - Target="Opacity" |
104 | | - From="0" |
105 | | - To="1" |
106 | | - Duration="0:0:0.2" /> |
107 | | - </animations:Implicit.ShowAnimations> |
108 | | - <animations:Implicit.HideAnimations> |
109 | | - <animations:ScalarAnimation |
110 | | - Target="Translation.X" |
111 | | - From="0" |
112 | | - To="300" |
113 | | - Duration="0:0:0.2" /> |
114 | | - <animations:ScalarAnimation |
115 | | - Target="Opacity" |
116 | | - From="1" |
117 | | - To="0" |
118 | | - Duration="0:0:0.2" /> |
119 | | - </animations:Implicit.HideAnimations> |
120 | | - </Border> |
| 84 | + BorderBrush="{ThemeResource ControlStrokeColorDefault}" |
| 85 | + ContentChanged="Pane_ContentChanged" |
| 86 | + CurrentInstanceBorderThickness="0,0,0,1" |
| 87 | + IsPageMainPane="False" |
| 88 | + Loaded="PaneRight_Loaded" |
| 89 | + NavParams="{x:Bind NavParamsRight, Mode=OneWay}" |
| 90 | + PaneHolder="{x:Bind}" /> |
121 | 91 |
|
122 | 92 | <Custom:GridSplitter |
123 | 93 | x:Name="PaneResizer" |
|
148 | 118 | PropertyName="CurrentInstanceBorderBrush" |
149 | 119 | TargetObject="{Binding ElementName=PaneLeft}" |
150 | 120 | Value="{StaticResource PaneSelectedBorderBrush}" /> |
| 121 | + <Core:ChangePropertyAction |
| 122 | + PropertyName="CurrentInstanceBorderThickness" |
| 123 | + TargetObject="{Binding ElementName=PaneLeft}" |
| 124 | + Value="0,0,0,2" /> |
151 | 125 | </Core:DataTriggerBehavior> |
152 | 126 | <Core:DataTriggerBehavior Binding="{x:Bind converters:MultiBooleanConverter.AndConvert(IsLeftPaneActive, IsRightPaneVisible), Mode=OneWay}" Value="False"> |
153 | 127 | <Core:ChangePropertyAction |
154 | 128 | PropertyName="CurrentInstanceBorderBrush" |
155 | 129 | TargetObject="{Binding ElementName=PaneLeft}" |
156 | | - Value="{StaticResource SystemControlTransparentBrush}" /> |
| 130 | + Value="{StaticResource ControlStrokeColorDefault}" /> |
| 131 | + <Core:ChangePropertyAction |
| 132 | + PropertyName="CurrentInstanceBorderThickness" |
| 133 | + TargetObject="{Binding ElementName=PaneLeft}" |
| 134 | + Value="0,0,0,1" /> |
157 | 135 | </Core:DataTriggerBehavior> |
158 | 136 | <Core:DataTriggerBehavior Binding="{x:Bind converters:MultiBooleanConverter.AndConvert(IsRightPaneActive, IsRightPaneVisible), Mode=OneWay}" Value="True"> |
159 | 137 | <Core:ChangePropertyAction |
160 | 138 | PropertyName="CurrentInstanceBorderBrush" |
161 | 139 | TargetObject="{Binding ElementName=PaneRight}" |
162 | 140 | Value="{StaticResource PaneSelectedBorderBrush}" /> |
| 141 | + <Core:ChangePropertyAction |
| 142 | + PropertyName="CurrentInstanceBorderThickness" |
| 143 | + TargetObject="{Binding ElementName=PaneRight}" |
| 144 | + Value="0,0,0,2" /> |
163 | 145 | </Core:DataTriggerBehavior> |
164 | 146 | <Core:DataTriggerBehavior Binding="{x:Bind converters:MultiBooleanConverter.AndConvert(IsRightPaneActive, IsRightPaneVisible), Mode=OneWay}" Value="False"> |
165 | 147 | <Core:ChangePropertyAction |
166 | 148 | PropertyName="CurrentInstanceBorderBrush" |
167 | 149 | TargetObject="{Binding ElementName=PaneRight}" |
168 | | - Value="{StaticResource SystemControlTransparentBrush}" /> |
| 150 | + Value="{StaticResource ControlStrokeColorDefault}" /> |
| 151 | + <Core:ChangePropertyAction |
| 152 | + PropertyName="CurrentInstanceBorderThickness" |
| 153 | + TargetObject="{Binding ElementName=PaneRight}" |
| 154 | + Value="0,0,0,1" /> |
169 | 155 | </Core:DataTriggerBehavior> |
170 | 156 | <Core:DataTriggerBehavior Binding="{x:Bind IsRightPaneVisible, Mode=OneWay}" Value="True"> |
171 | 157 | <Core:ChangePropertyAction |
|
0 commit comments