From 62d278b23e95a8264e24bdd10eaaddfcc21570a3 Mon Sep 17 00:00:00 2001
From: Laszlo Nemeth <57342539+donlaci@users.noreply.github.com>
Date: Thu, 14 Mar 2024 16:23:36 +0100
Subject: [PATCH] [ColorPicker]Convert main window to FluentWindow to fix
 window issues (#31805)

---
 src/modules/colorPicker/ColorPickerUI/MainWindow.xaml    | 8 +++++---
 src/modules/colorPicker/ColorPickerUI/MainWindow.xaml.cs | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/modules/colorPicker/ColorPickerUI/MainWindow.xaml b/src/modules/colorPicker/ColorPickerUI/MainWindow.xaml
index 6aa90ae58e2..061d90bc655 100644
--- a/src/modules/colorPicker/ColorPickerUI/MainWindow.xaml
+++ b/src/modules/colorPicker/ColorPickerUI/MainWindow.xaml
@@ -1,4 +1,4 @@
-<Window
+<ui:FluentWindow
     x:Class="ColorPicker.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -6,19 +6,21 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:e="http://schemas.microsoft.com/xaml/behaviors"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
     Width="120"
     Height="64"
     MinWidth="0"
     MinHeight="0"
-    AllowsTransparency="True"
     AutomationProperties.Name="Color Picker"
     Background="Transparent"
+    ExtendsContentIntoTitleBar="True"
     Opacity="0.1"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     SizeToContent="WidthAndHeight"
     SourceInitialized="MainWindowSourceInitialized"
     Topmost="True"
+    WindowCornerPreference="Default"
     WindowStyle="None"
     mc:Ignorable="d">
     <e:Interaction.Behaviors>
@@ -26,4 +28,4 @@
         <behaviors:AppearAnimationBehavior />
     </e:Interaction.Behaviors>
     <ContentControl x:Name="MainView" Content="{Binding MainViewModel}" />
-</Window>
+</ui:FluentWindow>
diff --git a/src/modules/colorPicker/ColorPickerUI/MainWindow.xaml.cs b/src/modules/colorPicker/ColorPickerUI/MainWindow.xaml.cs
index d25357c99f6..06f45f75d1d 100644
--- a/src/modules/colorPicker/ColorPickerUI/MainWindow.xaml.cs
+++ b/src/modules/colorPicker/ColorPickerUI/MainWindow.xaml.cs
@@ -13,7 +13,7 @@ namespace ColorPicker
     /// <summary>
     /// Interaction logic for MainWindow.xaml
     /// </summary>
-    public partial class MainWindow : Window
+    public partial class MainWindow : FluentWindow
     {
         public MainWindow()
         {