Skip to content

Code Quality: Change active pane border thickness in high contrast #15482

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 14 commits into from
May 28, 2024
Merged

Code Quality: Change active pane border thickness in high contrast #15482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5bae95d
Code Quality: Change active pane border thickness in high contrast
yaira2 May 27, 2024
3a0582c
Update ModernShellPage.xaml
yaira2 May 27, 2024
113c24e
Adjust shadow on active pane
yaira2 May 27, 2024
2a5535b
Merge branch 'main' into ya/DualPaneBorderThickness
yaira2 May 27, 2024
8e008d9
Update PaneHolderPage.xaml.cs
yaira2 May 27, 2024
5082e85
Update PaneHolderPage.xaml.cs
yaira2 May 27, 2024
0b1c075
Test
yaira2 May 27, 2024
a54ade9
Revert "Test"
yaira2 May 27, 2024
3f533b5
Update ModernShellPage.xaml
yaira2 May 28, 2024
3725e1a
Update ModernShellPage.xaml
yaira2 May 28, 2024
5af704e
Merge branch 'main' into ya/DualPaneBorderThickness
yaira2 May 28, 2024
d2ba251
Update PaneHolderPage.xaml.cs
yaira2 May 28, 2024
45e1ba0
Update PaneHolderPage.xaml.cs
yaira2 May 28, 2024
c63dbb8
Update PaneHolderPage.xaml.cs
yaira2 May 28, 2024
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: 11 additions & 11 deletions src/Files.App/Views/PaneHolderPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using Microsoft.UI.Xaml.Input;
using Microsoft.UI.Xaml.Navigation;
using System.Runtime.CompilerServices;
using Windows.System;

namespace Files.App.Views
{
Expand Down Expand Up @@ -364,23 +363,24 @@ private void SetShadow()
if (IsMultiPaneActive)
{
// Add theme shadow to the active pane
if (IsLeftPaneActive)
if (PaneRight is not null)
{
if (PaneRight is not null)
PaneRight.RootGrid.Translation = new System.Numerics.Vector3(0, 0, 0);
if (PaneLeft is not null)
PaneLeft.RootGrid.Translation = new System.Numerics.Vector3(0, 0, 32);
PaneRight.RootGrid.Translation = new System.Numerics.Vector3(0, 0, IsLeftPaneActive ? 0 : 32);
VisualStateManager.GoToState(PaneLeft, IsLeftPaneActive ? "ShellBorderFocusOnState" : "ShellBorderFocusOffState", true);
}
else

if (PaneLeft is not null)
{
if (PaneRight is not null)
PaneRight.RootGrid.Translation = new System.Numerics.Vector3(0, 0, 32);
if (PaneLeft is not null)
PaneLeft.RootGrid.Translation = new System.Numerics.Vector3(0, 0, 0);
PaneLeft.RootGrid.Translation = new System.Numerics.Vector3(0, 0, IsLeftPaneActive ? 32 : 0);
VisualStateManager.GoToState(PaneRight, IsLeftPaneActive ? "ShellBorderFocusOffState" : "ShellBorderFocusOnState", true);
}
}
else
{
PaneLeft.RootGrid.Translation = new System.Numerics.Vector3(0, 0, 8);

VisualStateManager.GoToState(PaneLeft, "ShellBorderDualPaneOffState", true);
}
}

private void Pane_RightTapped(object sender, RoutedEventArgs e)
Expand Down
34 changes: 34 additions & 0 deletions src/Files.App/Views/Shells/ModernShellPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,22 @@
Loaded="Page_Loaded"
mc:Ignorable="d">

<local:BaseShellPage.Resources>
<ResourceDictionary>
<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Light">
<Thickness x:Key="Local.ActivePane.BorderThickness">1</Thickness>
</ResourceDictionary>
<ResourceDictionary x:Key="Dark">
<Thickness x:Key="Local.ActivePane.BorderThickness">1</Thickness>
</ResourceDictionary>
<ResourceDictionary x:Key="HighContrast">
<Thickness x:Key="Local.ActivePane.BorderThickness">3</Thickness>
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
</ResourceDictionary>
</local:BaseShellPage.Resources>

<local:BaseShellPage.KeyboardAccelerators>
<KeyboardAccelerator
Key="V"
Expand Down Expand Up @@ -80,6 +96,24 @@
Navigated="ItemDisplayFrame_Navigated" />

<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="ShellBorderFocusState">
<VisualState x:Name="ShellBorderFocusOnState">
<VisualState.Setters>
<Setter Target="RootGrid.BorderThickness" Value="{ThemeResource Local.ActivePane.BorderThickness}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="ShellBorderFocusOffState">
<VisualState.Setters>
<Setter Target="RootGrid.BorderThickness" Value="1" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="ShellBorderDualPaneOffState">
<VisualState.Setters>
<Setter Target="RootGrid.BorderThickness" Value="1" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>

<VisualStateGroup x:Name="ShellBackgroundFocusState">
<VisualState x:Name="ShellBackgroundFocusOnState">
<VisualState.Setters>
Expand Down