Skip to content

Commit 53da302

Browse files
committed
Req
1 parent 53cd654 commit 53da302

File tree

1 file changed

+28
-22
lines changed

1 file changed

+28
-22
lines changed

src/Files.App/Views/MainPage.xaml

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,10 @@
198198
Height="*"
199199
MinHeight="100" />
200200
<RowDefinition Height="Auto" />
201-
<RowDefinition x:Name="PaneRow" Height="Auto" />
201+
<RowDefinition
202+
x:Name="InfoPaneRowDefinition"
203+
Height="Auto"
204+
MinHeight="{x:Bind InfoPane.MinHeight}" />
202205
<RowDefinition Height="Auto" MinHeight="8" />
203206
</Grid.RowDefinitions>
204207
<Grid.ColumnDefinitions>
@@ -207,7 +210,10 @@
207210
Width="*"
208211
MinWidth="208" />
209212
<ColumnDefinition Width="Auto" />
210-
<ColumnDefinition x:Name="PaneColumn" Width="Auto" />
213+
<ColumnDefinition
214+
x:Name="InfoPaneColumnDefinition"
215+
Width="Auto"
216+
MinWidth="{x:Bind InfoPane.MinWidth}" />
211217
<ColumnDefinition x:Name="ShelfPaneColumn" Width="Auto" />
212218
</Grid.ColumnDefinitions>
213219

@@ -232,9 +238,9 @@
232238
HorizontalContentAlignment="Stretch"
233239
Content="{x:Bind ViewModel.SelectedTabItem.ContentFrame, Mode=OneWay}" />
234240

235-
<!-- Preview Pane Splitter -->
241+
<!-- Info Pane Splitter -->
236242
<controls:GridSplitter
237-
x:Name="PaneSplitter"
243+
x:Name="InfoPaneSizer"
238244
Grid.Row="1"
239245
Grid.Column="1"
240246
x:Load="{x:Bind ViewModel.ShouldPreviewPaneBeActive, Mode=OneWay}"
@@ -452,36 +458,36 @@
452458
<VisualStateGroup x:Name="InfoPanePositionStates">
453459
<VisualState x:Name="InfoPanePositionNone">
454460
<VisualState.Setters>
455-
<Setter Target="PaneRow.MinHeight" Value="0" />
456-
<Setter Target="PaneRow.Height" Value="0" />
457-
<Setter Target="PaneColumn.MinWidth" Value="0" />
458-
<Setter Target="PaneColumn.Width" Value="0" />
461+
<Setter Target="InfoPaneRowDefinition.MinHeight" Value="0" />
462+
<Setter Target="InfoPaneRowDefinition.Height" Value="0" />
463+
<Setter Target="InfoPaneColumnDefinition.MinWidth" Value="0" />
464+
<Setter Target="InfoPaneColumnDefinition.Width" Value="0" />
459465
</VisualState.Setters>
460466
</VisualState>
461467
<VisualState x:Name="InfoPanePositionRight">
462468
<VisualState.Setters>
463469
<Setter Target="InfoPane.(Grid.Row)" Value="1" />
464470
<Setter Target="InfoPane.(Grid.Column)" Value="2" />
465-
<Setter Target="PaneSplitter.(Grid.Row)" Value="1" />
466-
<Setter Target="PaneSplitter.(Grid.Column)" Value="1" />
467-
<Setter Target="PaneSplitter.Width" Value="2" />
468-
<Setter Target="PaneSplitter.GripperCursor" Value="SizeWestEast" />
469-
<Setter Target="PaneColumn.Width" Value="{x:Bind UserSettingsService.InfoPaneSettingsService.VerticalSizePx, Mode=OneWay}" />
470-
<Setter Target="PaneRow.MinHeight" Value="0" />
471-
<Setter Target="PaneRow.Height" Value="0" />
471+
<Setter Target="InfoPaneSizer.(Grid.Row)" Value="1" />
472+
<Setter Target="InfoPaneSizer.(Grid.Column)" Value="1" />
473+
<Setter Target="InfoPaneSizer.Width" Value="2" />
474+
<Setter Target="InfoPaneSizer.GripperCursor" Value="SizeWestEast" />
475+
<Setter Target="InfoPaneColumnDefinition.Width" Value="{x:Bind UserSettingsService.InfoPaneSettingsService.VerticalSizePx, Mode=OneWay}" />
476+
<Setter Target="InfoPaneRowDefinition.MinHeight" Value="0" />
477+
<Setter Target="InfoPaneRowDefinition.Height" Value="0" />
472478
</VisualState.Setters>
473479
</VisualState>
474480
<VisualState x:Name="InfoPanePositionBottom">
475481
<VisualState.Setters>
476482
<Setter Target="InfoPane.(Grid.Row)" Value="3" />
477483
<Setter Target="InfoPane.(Grid.Column)" Value="0" />
478-
<Setter Target="PaneSplitter.(Grid.Row)" Value="2" />
479-
<Setter Target="PaneSplitter.(Grid.Column)" Value="0" />
480-
<Setter Target="PaneSplitter.Height" Value="2" />
481-
<Setter Target="PaneSplitter.GripperCursor" Value="SizeNorthSouth" />
482-
<Setter Target="PaneColumn.MinWidth" Value="0" />
483-
<Setter Target="PaneColumn.Width" Value="0" />
484-
<Setter Target="PaneRow.Height" Value="{x:Bind UserSettingsService.InfoPaneSettingsService.HorizontalSizePx, Mode=OneWay}" />
484+
<Setter Target="InfoPaneSizer.(Grid.Row)" Value="2" />
485+
<Setter Target="InfoPaneSizer.(Grid.Column)" Value="0" />
486+
<Setter Target="InfoPaneSizer.Height" Value="2" />
487+
<Setter Target="InfoPaneSizer.GripperCursor" Value="SizeNorthSouth" />
488+
<Setter Target="InfoPaneColumnDefinition.MinWidth" Value="0" />
489+
<Setter Target="InfoPaneColumnDefinition.Width" Value="0" />
490+
<Setter Target="InfoPaneRowDefinition.Height" Value="{x:Bind UserSettingsService.InfoPaneSettingsService.HorizontalSizePx, Mode=OneWay}" />
485491
</VisualState.Setters>
486492
</VisualState>
487493
</VisualStateGroup>

0 commit comments

Comments
 (0)