Skip to content

Commit 6ba3b4b

Browse files
ferrariofilippoyaira2
authored andcommitted
Use single TextBlock
1 parent ffd8d65 commit 6ba3b4b

File tree

2 files changed

+13
-26
lines changed

2 files changed

+13
-26
lines changed

src/Files.App/UserControls/Pane/InfoPane.xaml

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -240,33 +240,20 @@
240240
Visibility="Collapsed" />
241241

242242
<!-- Drive Details -->
243-
<StackPanel
244-
x:Name="DriveFormatAndType"
243+
<TextBlock
244+
x:Name="DriveFormatAndTypeTextBlock"
245245
Margin="12,12,12,24"
246246
HorizontalAlignment="Center"
247-
Orientation="Horizontal"
248-
Spacing="8"
247+
FontFamily="{ThemeResource ContentControlThemeFontFamily}"
248+
FontSize="14"
249+
IsTextSelectionEnabled="True"
250+
TextAlignment="Center"
251+
TextWrapping="Wrap"
249252
Visibility="Collapsed">
250-
<TextBlock
251-
x:Name="DriveFormatTextBox"
252-
HorizontalAlignment="Center"
253-
FontFamily="{ThemeResource ContentControlThemeFontFamily}"
254-
FontSize="14"
255-
IsTextSelectionEnabled="True"
256-
Text="{x:Bind ViewModel.SelectedDriveItem.Filesystem, Mode=OneWay}"
257-
TextAlignment="Center"
258-
TextWrapping="Wrap" />
259-
<TextBlock
260-
x:Name="DriveTypeTextBox"
261-
HorizontalAlignment="Center"
262-
FontFamily="{ThemeResource ContentControlThemeFontFamily}"
263-
FontSize="14"
264-
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
265-
IsTextSelectionEnabled="True"
266-
Text="{x:Bind ViewModel.SelectedDriveItem.TypeText, Mode=OneWay}"
267-
TextAlignment="Center"
268-
TextWrapping="Wrap" />
269-
</StackPanel>
253+
<Run Text="{x:Bind ViewModel.SelectedDriveItem.Filesystem, Mode=OneWay}" />
254+
<Run Text=" " />
255+
<Run Foreground="{ThemeResource TextFillColorTertiaryBrush}" Text="{x:Bind ViewModel.SelectedDriveItem.TypeText, Mode=OneWay}" />
256+
</TextBlock>
270257

271258
<TextBlock
272259
x:Name="UsedSpaceTextBox"
@@ -584,7 +571,7 @@
584571
<Setter Target="DetailsOpenProperties.Visibility" Value="Visible" />
585572
<Setter Target="PreviewControlPresenter.Visibility" Value="Visible" />
586573
<Setter Target="DetailsListHeader.Visibility" Value="Visible" />
587-
<Setter Target="DriveFormatAndType.Visibility" Value="Visible" />
574+
<Setter Target="DriveFormatAndTypeTextBlock.Visibility" Value="Visible" />
588575
<Setter Target="UsedSpaceTextBox.Visibility" Value="Visible" />
589576
<Setter Target="DriveSpaceProgressBar.Visibility" Value="Visible" />
590577
<Setter Target="DriveSpaceGrid.Visibility" Value="Visible" />

src/Files.App/ViewModels/UserControls/InfoPaneViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ private async Task LoadBasicPreviewAsync()
463463
await basicModel.LoadAsync();
464464

465465
PreviewPaneContent = new BasicPreview(basicModel);
466-
PreviewPaneState = SelectedItem.IsDriveRoot ? PreviewPaneStates.DrivePreviewAndDetailsAvailable : PreviewPaneStates.PreviewAndDetailsAvailable;
466+
PreviewPaneState = SelectedItem.IsDriveRoot ? PreviewPaneStates.DriveStorageDetailsAvailable : PreviewPaneStates.PreviewAndDetailsAvailable;
467467
}
468468
catch (Exception ex)
469469
{

0 commit comments

Comments
 (0)