Do something to #84

iNKORE-NET · Aug 19, 2024 · c6d42ed · c6d42ed
1 parent 081a3a6
commit c6d42ed
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/samples/WpfApp1/MainWindow.xaml b/samples/WpfApp1/MainWindow.xaml
@@ -24,5 +24,11 @@
             <ui:ToggleSwitch />
         </ui:SettingsCard>
 
+        <RichTextBox HorizontalAlignment="Left" Height="62" VerticalAlignment="Top" Width="150" Canvas.Left="446" Canvas.Top="179"
+                        BorderThickness="0">
+            <FrameworkElement.Resources>
+                <Thickness x:Key="{x:Static ui:ThemeKeys.TextControlBorderThemeThicknessFocusedKey}"></Thickness>
+            </FrameworkElement.Resources>
+        </RichTextBox>
     </Canvas>
 </Window>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/SamplePages/SampleSystemBackdropsWindow.xaml.cs b/source/iNKORE.UI.WPF.Modern.Gallery/SamplePages/SampleSystemBackdropsWindow.xaml.cs
@@ -26,7 +26,7 @@ namespace iNKORE.UI.WPF.Modern.Gallery.SamplePages
     public partial class SampleSystemBackdropsWindow : Window
     {
         BackdropType m_currentBackdrop => WindowHelper.GetSystemBackdropType(this);
-        bool m_useAcrylicBackdrop => WindowHelper.GetUseAcrylicBackdrop(this);
+        bool m_useAcrylicBackdrop => WindowHelper.GetSystemBackdropType(this) == BackdropType.Acrylic;
         bool m_useAeroBackdrop => WindowHelper.GetUseAeroBackdrop(this);
 
         public SampleSystemBackdropsWindow()
@@ -51,7 +51,7 @@ void ChangeBackdropButton_Click(object sender, RoutedEventArgs e)
             }
             else if (OSVersionHelper.IsWindows10OrGreater)
             {
-                WindowHelper.SetUseAcrylicBackdrop(this, !m_useAcrylicBackdrop);
+                WindowHelper.SetSystemBackdropType(this, m_useAcrylicBackdrop ? BackdropType.Acrylic : BackdropType.None);
             }
             else if (OSVersionHelper.IsWindowsVistaOrGreater)
             {

diff --git a/source/iNKORE.UI.WPF.Modern/Helpers/Styles/BackdropHelper.cs b/source/iNKORE.UI.WPF.Modern/Helpers/Styles/BackdropHelper.cs
@@ -94,10 +94,10 @@ public static bool Apply(IntPtr handle, BackdropType type, bool force = false, C
             if (handle == IntPtr.Zero) { return false; }
 
             // Fixes from: https://github.com/iNKORE-NET/UI.WPF.Modern/pull/63
-            //var captionColor = -2; //DWMWA_COLOR_NONE - 0xFFFFFFFE
-            //DWMAPI.DwmSetWindowAttribute(handle, DWMAPI.DWMWINDOWATTRIBUTE.DWMWA_CAPTION_COLOR,
-            //    ref captionColor,
-            //    Marshal.SizeOf(typeof(int)));
+            var captionColor = -2; //DWMWA_COLOR_NONE - 0xFFFFFFFE
+            DWMAPI.DwmSetWindowAttribute(handle, DWMAPI.DWMWINDOWATTRIBUTE.DWMWA_CAPTION_COLOR,
+                ref captionColor,
+                Marshal.SizeOf(typeof(int)));
 
             return type switch
             {
@@ -158,10 +158,10 @@ public static void Remove(IntPtr handle)
                 Marshal.SizeOf(typeof(int)));
 
             // Fixes from: https://github.com/iNKORE-NET/UI.WPF.Modern/pull/63
-            //var captionColor = -1; //DWMWA_COLOR_DEFAULT - 0xFFFFFFFF
-            //DWMAPI.DwmSetWindowAttribute(handle, DWMAPI.DWMWINDOWATTRIBUTE.DWMWA_CAPTION_COLOR,
-            //    ref captionColor,
-            //    Marshal.SizeOf(typeof(int)));
+            var captionColor = -1; //DWMWA_COLOR_DEFAULT - 0xFFFFFFFF
+            DWMAPI.DwmSetWindowAttribute(handle, DWMAPI.DWMWINDOWATTRIBUTE.DWMWA_CAPTION_COLOR,
+                ref captionColor,
+                Marshal.SizeOf(typeof(int)));
         }
 
         /// <summary>