Skip to content

Commit 2f7c349

Browse files
yaira2yaira2
authored
Added border to status bar to match design spec (#6003)
1 parent 5333330 commit 2f7c349

File tree

3 files changed

+42
-57
lines changed

3 files changed

+42
-57
lines changed

‎Files/ViewModels/ColumnsViewModel.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class ColumnsViewModel : ObservableObject
88
{
99
private ColumnViewModel iconColumn = new ColumnViewModel()
1010
{
11-
UserLength = new GridLength(44, GridUnitType.Pixel),
11+
UserLength = new GridLength(24, GridUnitType.Pixel),
1212
IsResizeable = false,
1313
};
1414

‎Files/Views/LayoutModes/DetailsLayoutBrowser.xaml

+4-5
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
TargetType="controls:GridSplitter">
5555
<Setter Property="Background" Value="Transparent" />
5656
<Setter Property="Width" Value="1" />
57+
<Setter Property="Margin" Value="0,4,0,4" />
5758
<Setter Property="Opacity" Value="0.8" />
5859
</Style>
5960

@@ -208,7 +209,6 @@
208209
<SemanticZoom.ZoomedInView>
209210
<ListView
210211
x:Name="FileList"
211-
Margin="0,4,0,0"
212212
Padding="8,0,8,12"
213213
HorizontalAlignment="Stretch"
214214
VerticalContentAlignment="Stretch"
@@ -242,11 +242,10 @@
242242
<ListView.Header>
243243
<Grid
244244
x:Name="HeaderGrid"
245-
Height="38"
246-
Margin="16,0,0,0"
247-
Padding="0"
245+
Height="40"
246+
Padding="16,0,0,0"
248247
Background="{ThemeResource FileBrowserHeaderBackgroundBrush}"
249-
BorderBrush="{ThemeResource SystemChromeHighColor}"
248+
BorderBrush="{ThemeResource ControlStrokeColorDefault}"
250249
BorderThickness="0,0,0,1"
251250
PointerPressed="Grid_PointerPressed">
252251
<Grid.ContextFlyout>

‎Files/Views/PaneHolderPage.xaml

+37-51
Original file line numberDiff line numberDiff line change
@@ -65,59 +65,29 @@
6565
<RowDefinition Height="*" />
6666
</Grid.RowDefinitions>
6767

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}" />
7878

79-
<Border
80-
x:Name="PaneRightLoader"
79+
<local:ModernShellPage
80+
x:Name="PaneRight"
8181
Grid.Row="1"
8282
Grid.Column="1"
8383
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}" />
12191

12292
<Custom:GridSplitter
12393
x:Name="PaneResizer"
@@ -148,24 +118,40 @@
148118
PropertyName="CurrentInstanceBorderBrush"
149119
TargetObject="{Binding ElementName=PaneLeft}"
150120
Value="{StaticResource PaneSelectedBorderBrush}" />
121+
<Core:ChangePropertyAction
122+
PropertyName="CurrentInstanceBorderThickness"
123+
TargetObject="{Binding ElementName=PaneLeft}"
124+
Value="0,0,0,2" />
151125
</Core:DataTriggerBehavior>
152126
<Core:DataTriggerBehavior Binding="{x:Bind converters:MultiBooleanConverter.AndConvert(IsLeftPaneActive, IsRightPaneVisible), Mode=OneWay}" Value="False">
153127
<Core:ChangePropertyAction
154128
PropertyName="CurrentInstanceBorderBrush"
155129
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" />
157135
</Core:DataTriggerBehavior>
158136
<Core:DataTriggerBehavior Binding="{x:Bind converters:MultiBooleanConverter.AndConvert(IsRightPaneActive, IsRightPaneVisible), Mode=OneWay}" Value="True">
159137
<Core:ChangePropertyAction
160138
PropertyName="CurrentInstanceBorderBrush"
161139
TargetObject="{Binding ElementName=PaneRight}"
162140
Value="{StaticResource PaneSelectedBorderBrush}" />
141+
<Core:ChangePropertyAction
142+
PropertyName="CurrentInstanceBorderThickness"
143+
TargetObject="{Binding ElementName=PaneRight}"
144+
Value="0,0,0,2" />
163145
</Core:DataTriggerBehavior>
164146
<Core:DataTriggerBehavior Binding="{x:Bind converters:MultiBooleanConverter.AndConvert(IsRightPaneActive, IsRightPaneVisible), Mode=OneWay}" Value="False">
165147
<Core:ChangePropertyAction
166148
PropertyName="CurrentInstanceBorderBrush"
167149
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" />
169155
</Core:DataTriggerBehavior>
170156
<Core:DataTriggerBehavior Binding="{x:Bind IsRightPaneVisible, Mode=OneWay}" Value="True">
171157
<Core:ChangePropertyAction

0 commit comments

Comments
 (0)