Skip to content

Commit 9436c88

Browse files
authored
Removed extra items from the status bar visual tree (#7935)
1 parent b53f99e commit 9436c88

File tree

1 file changed

+44
-34
lines changed

1 file changed

+44
-34
lines changed

src/Files/UserControls/StatusBarControl.xaml

Lines changed: 44 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -27,52 +27,62 @@
2727

2828
<Grid
2929
Height="32"
30+
Padding="8,0"
3031
HorizontalAlignment="Stretch"
31-
Background="{ThemeResource StatusBarBackgroundBrush}">
32+
VerticalAlignment="Stretch"
33+
Background="{ThemeResource StatusBarBackgroundBrush}"
34+
ColumnSpacing="12">
3235
<Grid.ColumnDefinitions>
36+
<ColumnDefinition Width="Auto" />
37+
<ColumnDefinition Width="Auto" />
38+
<ColumnDefinition Width="Auto" />
3339
<ColumnDefinition Width="*" />
3440
<ColumnDefinition Width="Auto" />
3541
</Grid.ColumnDefinitions>
3642

43+
<TextBlock
44+
x:Name="DirectoryItemCount"
45+
Grid.Column="0"
46+
VerticalAlignment="Center"
47+
x:Load="{x:Bind ShowInfoText, Mode=OneWay}"
48+
Text="{x:Bind DirectoryPropertiesViewModel.DirectoryItemCount, Mode=OneWay}" />
49+
<TextBlock
50+
x:Name="SelectedItemsCountString"
51+
Grid.Column="1"
52+
VerticalAlignment="Center"
53+
x:Load="{x:Bind ShowInfoText, Mode=OneWay}"
54+
Text="{x:Bind SelectedItemsPropertiesViewModel.SelectedItemsCountString, Mode=OneWay}"
55+
Visibility="{x:Bind SelectedItemsPropertiesViewModel.IsItemSelected, Mode=OneWay}" />
56+
<TextBlock
57+
x:Name="ItemSize"
58+
Grid.Column="2"
59+
VerticalAlignment="Center"
60+
x:Load="{x:Bind ShowInfoText, Mode=OneWay}"
61+
Text="{x:Bind SelectedItemsPropertiesViewModel.ItemSize, Mode=OneWay}"
62+
Visibility="{x:Bind SelectedItemsPropertiesViewModel.IsItemSelected, Mode=OneWay}" />
63+
64+
<Button
65+
x:Name="FullTrustStatus"
66+
Grid.Column="4"
67+
Width="32"
68+
Height="32"
69+
VerticalAlignment="Center"
70+
x:Load="{x:Bind MainViewModel.IsFullTrustElevated, Mode=OneWay}"
71+
AccessKey="M"
72+
Background="Transparent"
73+
Click="FullTrustStatus_Click"
74+
FontSize="16"
75+
Style="{StaticResource ToolBarButtonStyle}">
76+
<FontIcon FontSize="14" Glyph="&#xEA18;" />
77+
</Button>
78+
3779
<muxc:TeachingTip
3880
x:Name="FullTrustStatusTeachingTip"
3981
x:Uid="FullTrustStatusTeachingTip"
4082
Title="Administrator"
83+
Grid.ColumnSpan="5"
4184
Subtitle="Files is running as administrator"
4285
Target="{x:Bind FullTrustStatus}"
4386
Visibility="Collapsed" />
44-
45-
<StackPanel
46-
x:Name="SelectionDirectoryInformationPanel"
47-
Margin="8,0"
48-
VerticalAlignment="Center"
49-
x:Load="{x:Bind ShowInfoText, Mode=OneWay}"
50-
Orientation="Horizontal"
51-
Spacing="12">
52-
<TextBlock Text="{x:Bind DirectoryPropertiesViewModel.DirectoryItemCount, Mode=OneWay}" />
53-
<TextBlock Text="{x:Bind SelectedItemsPropertiesViewModel.SelectedItemsCountString, Mode=OneWay}" Visibility="{x:Bind SelectedItemsPropertiesViewModel.IsItemSelected, Mode=OneWay}" />
54-
<TextBlock Text="{x:Bind SelectedItemsPropertiesViewModel.ItemSize, Mode=OneWay}" Visibility="{x:Bind SelectedItemsPropertiesViewModel.IsItemSelected, Mode=OneWay}" />
55-
</StackPanel>
56-
57-
<StackPanel
58-
Grid.Column="1"
59-
Padding="0,0,2,0"
60-
HorizontalAlignment="Right"
61-
Orientation="Horizontal"
62-
Spacing="4">
63-
64-
<Button
65-
x:Name="FullTrustStatus"
66-
Width="32"
67-
Height="32"
68-
x:Load="{x:Bind MainViewModel.IsFullTrustElevated, Mode=OneWay}"
69-
AccessKey="M"
70-
Background="Transparent"
71-
Click="FullTrustStatus_Click"
72-
FontSize="16"
73-
Style="{StaticResource ToolBarButtonStyle}">
74-
<FontIcon FontSize="14" Glyph="&#xEA18;" />
75-
</Button>
76-
</StackPanel>
7787
</Grid>
7888
</UserControl>

0 commit comments

Comments
 (0)