Req

Author: 0x5bfa

src/Files.App/Views/MainPage.xaml

@@ -198,7 +198,7 @@
 							Height="*"
 							MinHeight="100" />
 						<RowDefinition Height="Auto" />
-						<RowDefinition x:Name="PaneRow" Height="Auto" />
+						<RowDefinition x:Name="InfoPaneRowDefinition" Height="Auto" />
 						<RowDefinition Height="Auto" MinHeight="8" />
 					</Grid.RowDefinitions>
 					<Grid.ColumnDefinitions>
@@ -207,7 +207,7 @@
 							Width="*"
 							MinWidth="208" />
 						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition x:Name="PaneColumn" Width="Auto" />
+						<ColumnDefinition x:Name="InfoPaneColumnDefinition" Width="Auto" />
 						<ColumnDefinition x:Name="ShelfPaneColumn" Width="Auto" />
 					</Grid.ColumnDefinitions>
 
@@ -232,9 +232,9 @@
 						HorizontalContentAlignment="Stretch"
 						Content="{x:Bind ViewModel.SelectedTabItem.ContentFrame, Mode=OneWay}" />
 
-					<!--  Preview Pane Splitter  -->
+					<!--  Info Pane Splitter  -->
 					<controls:GridSplitter
-						x:Name="PaneSplitter"
+						x:Name="InfoPaneSizer"
 						Grid.Row="1"
 						Grid.Column="1"
 						x:Load="{x:Bind ViewModel.ShouldPreviewPaneBeActive, Mode=OneWay}"
@@ -452,36 +452,38 @@
 			<VisualStateGroup x:Name="InfoPanePositionStates">
 				<VisualState x:Name="InfoPanePositionNone">
 					<VisualState.Setters>
-						<Setter Target="PaneRow.MinHeight" Value="0" />
-						<Setter Target="PaneRow.Height" Value="0" />
-						<Setter Target="PaneColumn.MinWidth" Value="0" />
-						<Setter Target="PaneColumn.Width" Value="0" />
+						<Setter Target="InfoPaneRowDefinition.MinHeight" Value="0" />
+						<Setter Target="InfoPaneRowDefinition.Height" Value="0" />
+						<Setter Target="InfoPaneColumnDefinition.MinWidth" Value="0" />
+						<Setter Target="InfoPaneColumnDefinition.Width" Value="0" />
 					</VisualState.Setters>
 				</VisualState>
 				<VisualState x:Name="InfoPanePositionRight">
 					<VisualState.Setters>
 						<Setter Target="InfoPane.(Grid.Row)" Value="1" />
 						<Setter Target="InfoPane.(Grid.Column)" Value="2" />
-						<Setter Target="PaneSplitter.(Grid.Row)" Value="1" />
-						<Setter Target="PaneSplitter.(Grid.Column)" Value="1" />
-						<Setter Target="PaneSplitter.Width" Value="2" />
-						<Setter Target="PaneSplitter.GripperCursor" Value="SizeWestEast" />
-						<Setter Target="PaneColumn.Width" Value="{x:Bind UserSettingsService.InfoPaneSettingsService.VerticalSizePx, Mode=OneWay}" />
-						<Setter Target="PaneRow.MinHeight" Value="0" />
-						<Setter Target="PaneRow.Height" Value="0" />
+						<Setter Target="InfoPaneSizer.(Grid.Row)" Value="1" />
+						<Setter Target="InfoPaneSizer.(Grid.Column)" Value="1" />
+						<Setter Target="InfoPaneSizer.Width" Value="2" />
+						<Setter Target="InfoPaneSizer.GripperCursor" Value="SizeWestEast" />
+						<Setter Target="InfoPaneColumnDefinition.Width" Value="{x:Bind UserSettingsService.InfoPaneSettingsService.VerticalSizePx, Mode=OneWay}" />
+						<Setter Target="InfoPaneRowDefinition.MinHeight" Value="0" />
+						<Setter Target="InfoPaneRowDefinition.MinWidth" Value="{x:Bind InfoPane.MinWidth}" />
+						<Setter Target="InfoPaneRowDefinition.Height" Value="0" />
 					</VisualState.Setters>
 				</VisualState>
 				<VisualState x:Name="InfoPanePositionBottom">
 					<VisualState.Setters>
 						<Setter Target="InfoPane.(Grid.Row)" Value="3" />
 						<Setter Target="InfoPane.(Grid.Column)" Value="0" />
-						<Setter Target="PaneSplitter.(Grid.Row)" Value="2" />
-						<Setter Target="PaneSplitter.(Grid.Column)" Value="0" />
-						<Setter Target="PaneSplitter.Height" Value="2" />
-						<Setter Target="PaneSplitter.GripperCursor" Value="SizeNorthSouth" />
-						<Setter Target="PaneColumn.MinWidth" Value="0" />
-						<Setter Target="PaneColumn.Width" Value="0" />
-						<Setter Target="PaneRow.Height" Value="{x:Bind UserSettingsService.InfoPaneSettingsService.HorizontalSizePx, Mode=OneWay}" />
+						<Setter Target="InfoPaneSizer.(Grid.Row)" Value="2" />
+						<Setter Target="InfoPaneSizer.(Grid.Column)" Value="0" />
+						<Setter Target="InfoPaneSizer.Height" Value="2" />
+						<Setter Target="InfoPaneSizer.GripperCursor" Value="SizeNorthSouth" />
+						<Setter Target="InfoPaneColumnDefinition.MinHeight" Value="{x:Bind InfoPane.MinHeight}" />
+						<Setter Target="InfoPaneColumnDefinition.MinWidth" Value="0" />
+						<Setter Target="InfoPaneColumnDefinition.Width" Value="0" />
+						<Setter Target="InfoPaneRowDefinition.Height" Value="{x:Bind UserSettingsService.InfoPaneSettingsService.HorizontalSizePx, Mode=OneWay}" />
 					</VisualState.Setters>
 				</VisualState>
 			</VisualStateGroup>

src/Files.App/Views/MainPage.xaml.cs

@@ -337,11 +337,11 @@ private void UpdatePositioning()
 						VisualStateManager.GoToState(this, "InfoPanePositionNone", true);
 						break;
 					case PreviewPanePositions.Right:
-						PaneSplitter.ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.SizeWestEast));
+						InfoPaneSizer.ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.SizeWestEast));
 						VisualStateManager.GoToState(this, "InfoPanePositionRight", true);
 						break;
 					case PreviewPanePositions.Bottom:
-						PaneSplitter.ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.SizeNorthSouth));
+						InfoPaneSizer.ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.SizeNorthSouth));
 						VisualStateManager.GoToState(this, "InfoPanePositionBottom", true);
 						break;
 				}