Use single TextBlock

files-community · Nov 24, 2024 · 2a90e9c · 2a90e9c
1 parent 4926a33
commit 2a90e9c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 26 deletions.
diff --git a/src/Files.App/UserControls/Pane/InfoPane.xaml b/src/Files.App/UserControls/Pane/InfoPane.xaml
@@ -240,33 +240,20 @@
 					Visibility="Collapsed" />
 
 				<!--  Drive Details  -->
-				<StackPanel
-					x:Name="DriveFormatAndType"
+				<TextBlock
+					x:Name="DriveFormatAndTypeTextBlock"
 					Margin="12,12,12,24"
 					HorizontalAlignment="Center"
-					Orientation="Horizontal"
-					Spacing="8"
+					FontFamily="{ThemeResource ContentControlThemeFontFamily}"
+					FontSize="14"
+					IsTextSelectionEnabled="True"
+					TextAlignment="Center"
+					TextWrapping="Wrap"
 					Visibility="Collapsed">
-					<TextBlock
-						x:Name="DriveFormatTextBox"
-						HorizontalAlignment="Center"
-						FontFamily="{ThemeResource ContentControlThemeFontFamily}"
-						FontSize="14"
-						IsTextSelectionEnabled="True"
-						Text="{x:Bind ViewModel.SelectedDriveItem.Filesystem, Mode=OneWay}"
-						TextAlignment="Center"
-						TextWrapping="Wrap" />
-					<TextBlock
-						x:Name="DriveTypeTextBox"
-						HorizontalAlignment="Center"
-						FontFamily="{ThemeResource ContentControlThemeFontFamily}"
-						FontSize="14"
-						Foreground="{ThemeResource TextFillColorTertiaryBrush}"
-						IsTextSelectionEnabled="True"
-						Text="{x:Bind ViewModel.SelectedDriveItem.TypeText, Mode=OneWay}"
-						TextAlignment="Center"
-						TextWrapping="Wrap" />
-				</StackPanel>
+					<Run Text="{x:Bind ViewModel.SelectedDriveItem.Filesystem, Mode=OneWay}" />
+					<Run Text=" " />
+					<Run Foreground="{ThemeResource TextFillColorTertiaryBrush}" Text="{x:Bind ViewModel.SelectedDriveItem.TypeText, Mode=OneWay}" />
+				</TextBlock>
 
 				<TextBlock
 					x:Name="UsedSpaceTextBox"
@@ -584,7 +571,7 @@
 						<Setter Target="DetailsOpenProperties.Visibility" Value="Visible" />
 						<Setter Target="PreviewControlPresenter.Visibility" Value="Visible" />
 						<Setter Target="DetailsListHeader.Visibility" Value="Visible" />
-						<Setter Target="DriveFormatAndType.Visibility" Value="Visible" />
+						<Setter Target="DriveFormatAndTypeTextBlock.Visibility" Value="Visible" />
 						<Setter Target="UsedSpaceTextBox.Visibility" Value="Visible" />
 						<Setter Target="DriveSpaceProgressBar.Visibility" Value="Visible" />
 						<Setter Target="DriveSpaceGrid.Visibility" Value="Visible" />

diff --git a/src/Files.App/ViewModels/UserControls/InfoPaneViewModel.cs b/src/Files.App/ViewModels/UserControls/InfoPaneViewModel.cs
@@ -463,7 +463,7 @@ private async Task LoadBasicPreviewAsync()
 				await basicModel.LoadAsync();
 
 				PreviewPaneContent = new BasicPreview(basicModel);
-				PreviewPaneState = SelectedItem.IsDriveRoot ? PreviewPaneStates.DrivePreviewAndDetailsAvailable : PreviewPaneStates.PreviewAndDetailsAvailable;
+				PreviewPaneState = SelectedItem.IsDriveRoot ? PreviewPaneStates.DriveStorageDetailsAvailable : PreviewPaneStates.PreviewAndDetailsAvailable;
 			}
 			catch (Exception ex)
 			{