Skip to content

Feature: Added dividers between status bar sections #12769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 28, 2023
Merged

Feature: Added dividers between status bar sections #12769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ffe40b
Feature: Added dividers between status bar sections
yaira2 Jun 28, 2023
ac4ef0a
Fix brush
yaira2 Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions src/Files.App/UserControls/StatusBarControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,14 @@
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
Text="{x:Bind DirectoryPropertiesViewModel.DirectoryItemCount, Mode=OneWay}" />

<!-- Divider -->
<Border
x:Name="SelectedItemsCountDivider"
Width="1"
Height="18"
x:Load="{x:Bind SelectedItemsPropertiesViewModel.IsItemSelected, Mode=OneWay}"
Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
<!-- Selected Items Count -->
<TextBlock
x:Name="SelectedItemsCountString"
VerticalAlignment="Center"
Expand All @@ -130,6 +138,14 @@
Text="{x:Bind SelectedItemsPropertiesViewModel.SelectedItemsCountString, Mode=OneWay}"
Visibility="{x:Bind SelectedItemsPropertiesViewModel.IsItemSelected, Mode=OneWay}" />

<!-- Divider -->
<Border
x:Name="ItemSizeDivider"
Width="1"
Height="18"
x:Load="{x:Bind SelectedItemsPropertiesViewModel.ItemSizeVisibility, Mode=OneWay}"
Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
<!-- Item Size -->
<TextBlock
x:Name="ItemSize"
VerticalAlignment="Center"
Expand Down Expand Up @@ -174,7 +190,7 @@
Width="1"
Height="18"
x:Load="{x:Bind converters:MultiBooleanConverter.AndNotConvert(Commands.OpenInVSCode.IsExecutable, Commands.OpenInVS.IsExecutable), Mode=OneWay}"
Background="{ThemeResource ControlStrokeColorDefaultBrush}" />
Background="{ThemeResource DividerStrokeColorDefaultBrush}" />

<!-- Open in VS Button -->
<Button
Expand Down Expand Up @@ -203,7 +219,7 @@
Width="1"
Height="18"
x:Load="{x:Bind Commands.OpenInVS.IsExecutable, Mode=OneWay}"
Background="{ThemeResource ControlStrokeColorDefaultBrush}" />
Background="{ThemeResource DividerStrokeColorDefaultBrush}" />

<Button
x:Name="GitNetworkActions"
Expand Down Expand Up @@ -267,7 +283,7 @@
<Border
Width="1"
Height="18"
Background="{ThemeResource ControlStrokeColorDefaultBrush}" />
Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
</StackPanel>

<!-- Use visibility because it causes a crash to use a TwoWay x:Bind on an element that is inside an element with x:Load (#12589, #12599) -->
Expand Down
4 changes: 2 additions & 2 deletions src/Files.App/Views/PaneHolderPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
<icore:ChangePropertyAction
PropertyName="CurrentInstanceBorderBrush"
TargetObject="{Binding ElementName=PaneLeft}"
Value="{StaticResource ControlStrokeColorDefault}" />
Value="{ThemeResource ControlStrokeColorDefault}" />
<icore:ChangePropertyAction
PropertyName="CurrentInstanceBorderThickness"
TargetObject="{Binding ElementName=PaneLeft}"
Expand All @@ -142,7 +142,7 @@
<icore:ChangePropertyAction
PropertyName="CurrentInstanceBorderBrush"
TargetObject="{Binding ElementName=PaneRight}"
Value="{StaticResource ControlStrokeColorDefault}" />
Value="{ThemeResource ControlStrokeColorDefault}" />
<icore:ChangePropertyAction
PropertyName="CurrentInstanceBorderThickness"
TargetObject="{Binding ElementName=PaneRight}"
Expand Down