mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-12-03 19:39:07 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Updated brushes

Browse Source
This commit is contained in:
Niels Laute 2024-03-05 11:51:44 +01:00
parent 20e5bb52dc
commit 6220b91425
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Packages.props
View File

@ -90,7 +90,7 @@
<PackageVersion Include="Vanara.PInvoke.User32" Version="3.4.11" />
<PackageVersion Include="Vanara.PInvoke.Shell32" Version="3.4.11" />
<PackageVersion Include="WinUIEx" Version="2.2.0" />
<PackageVersion Include="WPF-UI" Version="3.0.0-preview.13" />
<PackageVersion Include="WPF-UI" Version="3.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(IsExperimentationLive)'!=''">
<!-- Additional dependencies used by experimentation -->

5
src/modules/fancyzones/editor/FancyZonesEditor/LayoutOverlayWindow.xaml
View File

@ -1,4 +1,5 @@
<Window
<ui:FluentWindow
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
x:Class="FancyZonesEditor.LayoutOverlayWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@ -9,7 +10,7 @@
Width="800"
Height="450"
AllowsTransparency="True"
Background="{DynamicResource BackdropBrush}"
Background="#85F0F0F0"
Loaded="Window_Loaded"
ResizeMode="NoResize"
ShowInTaskbar="False"

5
src/modules/fancyzones/editor/FancyZonesEditor/LayoutOverlayWindow.xaml.cs
View File

@ -3,13 +3,14 @@
// See the LICENSE file in the project root for more information.
using System.Windows;
using Wpf.Ui.Controls;
namespace FancyZonesEditor
{
/// <summary>
/// Interaction logic for LayoutOverlayWindow.xaml
/// </summary>
public partial class LayoutOverlayWindow : Window
public partial class LayoutOverlayWindow : FluentWindow
{
public LayoutOverlayWindow()
{
@ -18,7 +19,7 @@ namespace FancyZonesEditor
private void Window_Loaded(object sender, RoutedEventArgs e)
{
Utils.NativeMethods.SetWindowStyleToolWindow(this);
// Utils.NativeMethods.SetWindowStyleToolWindow(this);
}
}
}

2
src/modules/fancyzones/editor/FancyZonesEditor/LayoutPreview.xaml
View File

@ -10,7 +10,7 @@
Loaded="OnLoaded"
mc:Ignorable="d">
<Grid>
<Border Background="{DynamicResource LayoutPreviewBackgroundBrush}" CornerRadius="4" />
<Border Background="Transparent" CornerRadius="4" />
<Grid x:Name="Body" Background="Transparent" />
</Grid>
</UserControl>

1
src/modules/fancyzones/editor/FancyZonesEditor/Overlay.cs
View File

@ -330,6 +330,7 @@ namespace FancyZonesEditor
}
// reset main window owner to keep it on the top
CurrentLayoutWindow.Background = new System.Windows.Media.SolidColorBrush(System.Windows.Media.Colors.Transparent);
_mainWindow.Owner = CurrentLayoutWindow;
_mainWindow.ShowActivated = true;
_mainWindow.Topmost = true;