Skip to content

Feature: Rounded the corners on the file area #13003

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 15 commits into from
Jul 21, 2023
Merged

Feature: Rounded the corners on the file area #13003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
863f434
Update SidebarControl.xaml
yaira2 Jul 12, 2023
cfa136f
Merge branch 'main' into ya/Layers
yaira2 Jul 20, 2023
b9fc65d
Fixed xaml formatting
yaira2 Jul 20, 2023
99d42e9
Update App.xaml
yaira2 Jul 20, 2023
3bf4579
Update App.xaml
yaira2 Jul 20, 2023
1a5b70e
Fixed file area in high contrast
yaira2 Jul 20, 2023
116d44b
Update App.xaml
yaira2 Jul 20, 2023
2598cc7
Update PathIcons.xaml
yaira2 Jul 20, 2023
8be9dca
Update PathIcons.xaml
yaira2 Jul 20, 2023
add2e18
Update PathIcons.xaml
yaira2 Jul 20, 2023
5d24295
Update PathIcons.xaml
yaira2 Jul 20, 2023
aaff6ef
Update PathIcons.xaml
yaira2 Jul 20, 2023
89733f5
Update PathIcons.xaml
yaira2 Jul 20, 2023
6efe7d4
Update PathIcons.xaml
yaira2 Jul 20, 2023
b2ecc28
Merge branch 'main' into ya/Layers
yaira2 Jul 21, 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
14 changes: 7 additions & 7 deletions src/Files.App/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
<ResourceDictionary x:Key="Light">
<SolidColorBrush x:Key="App.Theme.BackgroundBrush" Color="Transparent" />
<SolidColorBrush x:Key="App.Theme.AddressBar.BackgroundBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
<SolidColorBrush x:Key="App.Theme.Sidebar.BackgroundBrush" Color="{StaticResource CardBackgroundFillColorDefault}" />
<SolidColorBrush x:Key="App.Theme.FileArea.BackgroundBrush" Color="{StaticResource CardBackgroundFillColorDefault}" />
<SolidColorBrush x:Key="App.Theme.Sidebar.BackgroundBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
<SolidColorBrush x:Key="App.Theme.FileArea.BackgroundBrush" Color="#C0FCFCFC" />

<SolidColorBrush x:Key="TabViewItemHeaderBackground" Color="{StaticResource SubtleFillColorTransparent}" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
Expand All @@ -45,8 +45,8 @@
<ResourceDictionary x:Key="Dark">
<SolidColorBrush x:Key="App.Theme.BackgroundBrush" Color="Transparent" />
<SolidColorBrush x:Key="App.Theme.AddressBar.BackgroundBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
<SolidColorBrush x:Key="App.Theme.Sidebar.BackgroundBrush" Color="#993A3A3A" />
<SolidColorBrush x:Key="App.Theme.FileArea.BackgroundBrush" Color="#993A3A3A" />
<SolidColorBrush x:Key="App.Theme.Sidebar.BackgroundBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
<SolidColorBrush x:Key="App.Theme.FileArea.BackgroundBrush" Color="#10f9f9f9" />

<SolidColorBrush x:Key="TabViewItemHeaderBackground" Color="{StaticResource SubtleFillColorTransparent}" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
Expand All @@ -56,11 +56,11 @@
<ResourceDictionary x:Key="HighContrast">
<SolidColorBrush x:Key="App.Theme.BackgroundBrush" Color="Transparent" />
<SolidColorBrush x:Key="App.Theme.AddressBar.BackgroundBrush" Color="Transparent" />
<SolidColorBrush x:Key="App.Theme.Sidebar.BackgroundBrush" Color="{StaticResource CardBackgroundFillColorDefault}" />
<SolidColorBrush x:Key="App.Theme.FileArea.BackgroundBrush" Color="{StaticResource CardBackgroundFillColorDefault}" />
<SolidColorBrush x:Key="App.Theme.Sidebar.BackgroundBrush" Color="Transparent" />
<SolidColorBrush x:Key="App.Theme.FileArea.BackgroundBrush" Color="Transparent" />

<SolidColorBrush x:Key="TabViewItemHeaderBackground" Color="{StaticResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource LayerFillColorDefault}" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource SystemColorHighlightColor}" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{StaticResource SystemColorHighlightColor}" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{StaticResource SystemColorHighlightColor}" />
</ResourceDictionary>
Expand Down
17 changes: 11 additions & 6 deletions src/Files.App/UserControls/SidebarControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,9 @@
<!-- Removes NavigationView background -->
<SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />

<!-- Removes NavigationView corner radius -->
<CornerRadius x:Key="NavigationViewContentGridCornerRadius">0</CornerRadius>

<!-- Removes NavigationView border from top, right and bottom -->
<Thickness x:Key="NavigationViewContentGridBorderThickness">1,0,0,0</Thickness>
<Thickness x:Key="NavigationViewContentGridBorderThickness">0,0,0,0</Thickness>
<Thickness x:Key="NavigationViewMinimalContentGridBorderThickness">0,0,0,0</Thickness>

<mconv:BoolNegationConverter x:Key="BoolNegationConverter" />
<mconv:StringFormatConverter x:Key="StringFormatConverter" />
Expand Down Expand Up @@ -409,11 +407,18 @@
x:Name="ContentRoot"
Grid.Row="2"
Grid.ColumnSpan="2"
Background="{ThemeResource App.Theme.FileArea.BackgroundBrush}">
Background="{ThemeResource App.Theme.Sidebar.BackgroundBrush}">
<Grid.RenderTransform>
<CompositeTransform x:Name="ContentTransform" />
</Grid.RenderTransform>
<Border Child="{TemplateBinding Content}" />
<Border
x:Name="FileAreaBorder"
Background="{ThemeResource App.Theme.FileArea.BackgroundBrush}"
BackgroundSizing="InnerBorderEdge"
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
BorderThickness="1,1,0,0"
Child="{TemplateBinding Content}"
CornerRadius="8,0,0,0" />

<Rectangle
x:Name="LightDismissLayer"
Expand Down
6 changes: 1 addition & 5 deletions src/Files.App/Views/MainPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,7 @@

<!-- Head Contents -->
<uc:SidebarControl.TabContent>
<Grid
x:Name="RightMarginGrid"
VerticalAlignment="Top"
BorderBrush="{ThemeResource ControlStrokeColorDefault}"
BorderThickness="0,0,0,1">
<Grid x:Name="RightMarginGrid" VerticalAlignment="Top">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
Expand Down