mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-06-07 09:28:03 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

[Settings][Flyout] Fix missing borders on Windows 10 (#23825)

Browse Source 
* fix missing borders on windows 10

* use correct color brush
This commit is contained in:
Davide Giacometti 2023-02-13 19:46:06 +01:00 committed by GitHub
parent 483e37c8b0
commit bc4bde8cee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/settings-ui/Settings.UI/FlyoutWindow.xaml
View File

@ -1,4 +1,4 @@
<winuiex:WindowEx <winuiex:WindowEx
x:Class="Microsoft.PowerToys.Settings.UI.FlyoutWindow" x:Class="Microsoft.PowerToys.Settings.UI.FlyoutWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@ -7,6 +7,8 @@
xmlns:local="using:Microsoft.PowerToys.Settings.UI" xmlns:local="using:Microsoft.PowerToys.Settings.UI"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:winuiex="using:WinUIEx" xmlns:winuiex="using:WinUIEx"
xmlns:i="using:Microsoft.Xaml.Interactivity"
xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
Title="PowerToys Settings" Title="PowerToys Settings"
IsAlwaysOnTop="True" IsAlwaysOnTop="True"
IsMaximizable="False" IsMaximizable="False"
@ -27,6 +29,21 @@
LightTintOpacity="0" /> LightTintOpacity="0" />
</winuiex:WindowEx.Backdrop> </winuiex:WindowEx.Backdrop>
<Grid> <Grid>
<flyout:ShellPage x:Name="FlyoutShellPage"/> <!-- HACK: https://github.com/microsoft/microsoft-ui-xaml/issues/7629 -->
<!-- W11 grey border, W10: no border -->
<i:Interaction.Behaviors>
<ic:DataTriggerBehavior
Binding="{x:Bind ViewModel.Windows10}"
ComparisonCondition="Equal"
Value="True">
<ic:ChangePropertyAction
PropertyName="BorderThickness"
Value="1" />
<ic:ChangePropertyAction
PropertyName="BorderBrush"
Value="{ThemeResource SurfaceStrokeColorDefaultBrush}" />
</ic:DataTriggerBehavior>
</i:Interaction.Behaviors>
<flyout:ShellPage x:Name="FlyoutShellPage" />
</Grid> </Grid>
</winuiex:WindowEx> </winuiex:WindowEx>

27
src/settings-ui/Settings.UI/ViewModels/Flyout/FlyoutViewModel.cs
View File

@ -2,8 +2,10 @@
// The Microsoft Corporation licenses this file to you under the MIT license. // The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System; using System.ComponentModel;
using System.Runtime.CompilerServices;
using System.Timers; using System.Timers;
using Microsoft.PowerToys.Settings.UI.Library.Utilities;
namespace Microsoft.PowerToys.Settings.UI.ViewModels.Flyout namespace Microsoft.PowerToys.Settings.UI.ViewModels.Flyout
{ {
@ -11,6 +13,21 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels.Flyout
{ {
public bool CanHide { get; set; } public bool CanHide { get; set; }
private bool _windows10;
public bool Windows10
{
get => _windows10;
set
{
if (_windows10 != value)
{
_windows10 = value;
OnPropertyChanged();
}
}
}
private Timer hideTimer; private Timer hideTimer;
public FlyoutViewModel() public FlyoutViewModel()
@ -20,6 +37,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels.Flyout
hideTimer.Elapsed += HideTimer_Elapsed; hideTimer.Elapsed += HideTimer_Elapsed;
hideTimer.Interval = 1000; hideTimer.Interval = 1000;
hideTimer.Enabled = false; hideTimer.Enabled = false;
_windows10 = !Helper.Windows11();
} }
private void HideTimer_Elapsed(object sender, ElapsedEventArgs e) private void HideTimer_Elapsed(object sender, ElapsedEventArgs e)
@ -34,5 +52,12 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels.Flyout
hideTimer.Stop(); hideTimer.Stop();
hideTimer.Start(); hideTimer.Start();
} }
public event PropertyChangedEventHandler PropertyChanged;
private void OnPropertyChanged([CallerMemberName] string propertyName = null)
{
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
}
} }
} }