From 61c14109bc6428d98369cf1985002f790960f498 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Tue, 30 Apr 2024 05:49:06 +0900
Subject: [PATCH] Adjust Pane and Page Colors

---
 .../Resources/CustomControlTemplate.xaml      |  2 +-
 .../SettingPages/Views/SettingsPaneAbout.xaml | 39 +++++++++++--------
 .../Views/SettingsPaneGeneral.xaml            |  3 +-
 Flow.Launcher/SettingWindow.xaml              |  1 +
 4 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 0ed1d18c8..cbb828582 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -4763,7 +4763,7 @@
                                 IsPaneOpen="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsPaneOpen, Mode=TwoWay}"
                                 IsTabStop="False"
                                 OpenPaneLength="{TemplateBinding OpenPaneLength}"
-                                PaneBackground="{DynamicResource NavigationViewDefaultPaneBackground}">
+                                PaneBackground="Transparent">
 
                                 <ui:SplitView.Pane>
                                     <Grid
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
index bec0d7bea..19e583681 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
@@ -2,11 +2,11 @@
     x:Class="Flow.Launcher.SettingPages.Views.SettingsPaneAbout"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cc="clr-namespace:Flow.Launcher.Resources.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="http://schemas.modernwpf.com/2019"
-    xmlns:cc="clr-namespace:Flow.Launcher.Resources.Controls"
     xmlns:settingsVm="clr-namespace:Flow.Launcher.SettingPages.ViewModels"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
     Title="About"
     d:DataContext="{d:DesignInstance Type=settingsVm:SettingsPaneAboutViewModel}"
     d:DesignHeight="450"
@@ -14,9 +14,8 @@
     mc:Ignorable="d">
     <ScrollViewer
         Margin="0,0,0,0"
-        Background="{DynamicResource Color01B}"
-        FontSize="14"
         CanContentScroll="True"
+        FontSize="14"
         VirtualizingStackPanel.IsVirtualizing="True"
         VirtualizingStackPanel.ScrollUnit="Pixel">
         <StackPanel Margin="5,14,25,30" Orientation="Vertical">
@@ -28,7 +27,10 @@
                 TextAlignment="left" />
 
 
-            <cc:Card Title="{Binding Version}" Sub="{DynamicResource version}" Icon="&#xe946;">
+            <cc:Card
+                Title="{Binding Version}"
+                Icon="&#xe946;"
+                Sub="{DynamicResource version}">
                 <StackPanel Orientation="Horizontal">
                     <Button
                         Margin="0,0,10,0"
@@ -56,7 +58,10 @@
                 </TextBlock>
             </cc:Card>
 
-            <cc:Card Margin="0,14,0,0" Title="{DynamicResource website}" Icon="&#xeb41;">
+            <cc:Card
+                Title="{DynamicResource website}"
+                Margin="0,14,0,0"
+                Icon="&#xeb41;">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Margin="0,0,12,0">
                         <Hyperlink NavigateUri="{Binding Website, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
@@ -87,7 +92,10 @@
                 </StackPanel>
             </cc:Card>
 
-            <cc:Card Margin="0,14,0,0" Title="{DynamicResource icons}" Icon="&#xE8FE;">
+            <cc:Card
+                Title="{DynamicResource icons}"
+                Margin="0,14,0,0"
+                Icon="&#xE8FE;">
                 <TextBlock>
                     <Hyperlink NavigateUri="https://icons8.com/" RequestNavigate="OnRequestNavigate">
                         <Run Text="icons8.com" />
@@ -101,28 +109,25 @@
                         Margin="0,0,12,0"
                         Command="{Binding AskClearLogFolderConfirmationCommand}"
                         Content="{Binding LogFolderSize, Mode=OneWay}" />
-                    <Button Content="&#xec7a;" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20">
+                    <Button
+                        Content="&#xec7a;"
+                        FontFamily="/Resources/#Segoe Fluent Icons"
+                        FontSize="20">
                         <ui:FlyoutService.Flyout>
                             <ui:MenuFlyout>
-                                <MenuItem
-                                    Command="{Binding OpenWelcomeWindowCommand}"
-                                    Header="{DynamicResource welcomewindow}">
+                                <MenuItem Command="{Binding OpenWelcomeWindowCommand}" Header="{DynamicResource welcomewindow}">
                                     <MenuItem.Icon>
                                         <ui:FontIcon Glyph="&#xe939;" />
                                     </MenuItem.Icon>
                                 </MenuItem>
 
-                                <MenuItem
-                                    Command="{Binding OpenSettingsFolderCommand}"
-                                    Header="{DynamicResource settingfolder}">
+                                <MenuItem Command="{Binding OpenSettingsFolderCommand}" Header="{DynamicResource settingfolder}">
                                     <MenuItem.Icon>
                                         <ui:FontIcon Glyph="&#xe8b7;" />
                                     </MenuItem.Icon>
                                 </MenuItem>
 
-                                <MenuItem
-                                    Command="{Binding OpenLogsFolderCommand}"
-                                    Header="{DynamicResource logfolder}">
+                                <MenuItem Command="{Binding OpenLogsFolderCommand}" Header="{DynamicResource logfolder}">
                                     <MenuItem.Icon>
                                         <ui:FontIcon Glyph="&#xe8b7;" />
                                     </MenuItem.Icon>
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index f6e38795d..f644781df 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -5,9 +5,9 @@
     xmlns:cc="clr-namespace:Flow.Launcher.Resources.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:settingsViewModels="clr-namespace:Flow.Launcher.SettingPages.ViewModels"
     xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
-    xmlns:settingsViewModels="clr-namespace:Flow.Launcher.SettingPages.ViewModels"
     Title="General"
     d:DataContext="{d:DesignInstance settingsViewModels:SettingsPaneGeneralViewModel}"
     d:DesignHeight="450"
@@ -15,7 +15,6 @@
     mc:Ignorable="d">
     <ScrollViewer
         Margin="0,0,0,0"
-        Background="{DynamicResource Color01B}"
         CanContentScroll="False"
         FontSize="14"
         VirtualizingPanel.ScrollUnit="Pixel"
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index b91af61c5..db3eaf324 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -179,6 +179,7 @@
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
                     AlwaysShowHeader="False"
+                    Background="{DynamicResource Color01B}"
                     ExpandedModeThresholdWidth="300"
                     IsBackButtonVisible="Collapsed"
                     IsPaneToggleButtonVisible="False"