Darkmode CPriority Change Window

Flow.Launcher/PriorityChangeWindow.xaml

@@ -7,84 +7,117 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.modernwpf.com/2019"
     Title="{DynamicResource changePriorityWindow}"
-    Background="#F3F3F3"
-    BorderBrush="#cecece"
+    Width="350"
+    Background="{DynamicResource PopuBGColor}"
+    Foreground="{DynamicResource PopupTextColor}"
     Loaded="PriorityChangeWindow_Loaded"
     MouseDown="window_MouseDown"
     ResizeMode="NoResize"
-    SizeToContent="WidthAndHeight"
+    SizeToContent="Height"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <Grid Width="350">
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
+    </WindowChrome.WindowChrome>
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
             <RowDefinition Height="80" />
         </Grid.RowDefinitions>
-        <Border
-            Padding="26,26,26,0"
-            Background="#ffffff"
-            BorderBrush="#e5e5e5"
-            BorderThickness="0,0,0,1">
-            <Grid>
-                <StackPanel>
-                    <StackPanel Grid.Row="0" Margin="0,0,0,12">
-                        <TextBlock
-                            Grid.Column="0"
-                            Margin="0,0,0,0"
-                            FontFamily="Segoe UI"
-                            FontSize="20"
-                            FontWeight="SemiBold"
-                            Text="{DynamicResource changePriorityWindow}"
-                            TextAlignment="Left" />
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock
-                            FontSize="14"
-                            Foreground="#1b1b1b"
-                            Text="{DynamicResource priority_tips}"
-                            TextAlignment="Left"
-                            TextWrapping="WrapWithOverflow" />
-                    </StackPanel>
 
-                    <StackPanel Margin="0,24,0,24" Orientation="Horizontal">
-                        <TextBlock
-                            HorizontalAlignment="Right"
-                            VerticalAlignment="Center"
-                            FontSize="14"
-                            Text="{DynamicResource priority}" />
-                        <ui:NumberBox
-                            x:Name="tbAction"
-                            Width="190"
-                            Height="34"
-                            Margin="10,0,15,0"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            Minimum="0"
-                            SmallChange="1"
-                            SpinButtonPlacementMode="Inline" />
-                    </StackPanel>
+        <StackPanel Grid.Row="0">
+            <StackPanel>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Button
+                        Grid.Column="4"
+                        Click="BtnCancel_OnClick"
+                        Style="{StaticResource TitleBarCloseButtonStyle}">
+                        <Path
+                            Width="46"
+                            Height="32"
+                            Data="M 18,11 27,20 M 18,20 27,11"
+                            Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                            StrokeThickness="1">
+                            <Path.Style>
+                                <Style TargetType="Path">
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+                                            <Setter Property="Opacity" Value="0.5" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Path.Style>
+                        </Path>
+                    </Button>
+                </Grid>
+            </StackPanel>
+            <StackPanel Margin="26,12,26,0">
+                <StackPanel Margin="0,0,0,12">
+                    <TextBlock
+                        Grid.Column="0"
+                        Margin="0,0,0,0"
+                        FontFamily="Segoe UI"
+                        FontSize="20"
+                        FontWeight="SemiBold"
+                        Text="{DynamicResource changePriorityWindow}"
+                        TextAlignment="Left" />
                 </StackPanel>
-            </Grid>
-        </Border>
-        <StackPanel
-            Grid.Row="1"
-            HorizontalAlignment="Center"
-            Orientation="Horizontal">
-            <Button
-                x:Name="btnCancel"
-                Width="100"
-                Height="30"
-                Margin="0,0,5,0"
-                Click="BtnCancel_OnClick"
-                Content="{DynamicResource cancel}" />
-            <Button
-                x:Name="btnDone"
-                Width="100"
-                Height="30"
-                Margin="5,0,0,0"
-                Click="btnDone_OnClick">
-                <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
-            </Button>
+                <StackPanel>
+                    <TextBlock
+                        FontSize="14"
+                        Text="{DynamicResource priority_tips}"
+                        TextAlignment="Left"
+                        TextWrapping="WrapWithOverflow" />
+                </StackPanel>
+
+                <StackPanel Margin="0,24,0,24" Orientation="Horizontal">
+                    <TextBlock
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        FontSize="14"
+                        Text="{DynamicResource priority}" />
+                    <ui:NumberBox
+                        x:Name="tbAction"
+                        Width="200"
+                        Margin="10,0,15,0"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        CornerRadius="4"
+                        Minimum="0"
+                        SmallChange="1"
+                        SpinButtonPlacementMode="Inline" />
+                </StackPanel>
+            </StackPanel>
         </StackPanel>
+        <Border
+            Grid.Row="1"
+            Background="{DynamicResource PopupButtonAreaBGColor}"
+            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+            BorderThickness="0,1,0,0">
+            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                <Button
+                    x:Name="btnCancel"
+                    Width="100"
+                    Height="30"
+                    Margin="0,0,5,0"
+                    Click="BtnCancel_OnClick"
+                    Content="{DynamicResource cancel}" />
+                <Button
+                    x:Name="btnDone"
+                    Width="100"
+                    Height="30"
+                    Margin="5,0,0,0"
+                    Click="btnDone_OnClick">
+                    <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
+                </Button>
+            </StackPanel>
+        </Border>
     </Grid>
 </Window>

Flow.Launcher/Resources/Dark.xaml

@@ -28,10 +28,16 @@
     <SolidColorBrush x:Key="Color19B" Color="#2a2a2a" />
     <SolidColorBrush x:Key="Color20B" Color="#303030" />
     <SolidColorBrush x:Key="Color21B" Color="#464646" />
-    <SolidColorBrush x:Key="Color22B" Color="#3c3c3c" />
+    <SolidColorBrush x:Key="Color22B" Color="#3C3C3C" />
     <SolidColorBrush x:Key="Color23B" Color="#272727" />
     <SolidColorBrush x:Key="Color24B" Color="#9a9a9a" />
     <SolidColorBrush x:Key="Color25B" Color="#323232" />
+    <SolidColorBrush x:Key="NumberBoxColor23B" Color="#3c3c3c" />
+    <SolidColorBrush x:Key="NumberBoxColor24B" Color="#272727" />
+    <SolidColorBrush x:Key="NumberBoxColor25B" Color="#5d5d5d" />
+    <SolidColorBrush x:Key="NumberBoxColor26B" Color="#ffffff" />
+    <SolidColorBrush x:Key="CustomNumberBoxBG" Color="#292929" />
+
     <SolidColorBrush x:Key="ThemeHoverButton" Color="#3c3c3c" />
     <SolidColorBrush x:Key="PopuBGColor" Color="#2b2b2b" />
     <SolidColorBrush x:Key="PopupTextColor" Color="#cfcfcf" />
@@ -62,6 +68,10 @@
     <Color x:Key="Color23">#272727</Color>
     <Color x:Key="Color24">#9a9a9a</Color>
     <Color x:Key="Color25">#323232</Color>
+    <Color x:Key="NumberBoxColor23">#f2f2f2</Color>
+    <Color x:Key="NumberBoxColor24">#f5f5f5</Color>
+    <Color x:Key="NumberBoxColor25">#464646</Color>
+    <Color x:Key="NumberBoxColor26">#ffffff</Color>
 
 
     <SolidColorBrush x:Key="ButtonOutBorder" Color="Transparent" />
@@ -1515,8 +1525,8 @@
     <Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness>
     <Thickness x:Key="TextControlMarginThemeThickness">0,9.5,0,9.5</Thickness>
     <Thickness x:Key="HelperButtonThemePadding">0,0,-2,0</Thickness>
-    <m:StaticResource x:Key="TextControlForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
-    <m:StaticResource x:Key="TextControlForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush" />
+    <m:StaticResource x:Key="TextControlForeground" ResourceKey="Color05B" />
+    <m:StaticResource x:Key="TextControlForegroundPointerOver" ResourceKey="Color05B" />
     <m:StaticResource x:Key="TextControlForegroundFocused" ResourceKey="SystemControlForegroundBaseHighBrush" />
     <m:StaticResource x:Key="TextControlForegroundDisabled" ResourceKey="SystemControlDisabledChromeDisabledLowBrush" />
     <m:StaticResource x:Key="TextControlBackground" ResourceKey="Color09B" />

Flow.Launcher/Resources/Light.xaml

@@ -29,6 +29,12 @@
     <SolidColorBrush x:Key="Color20B" Color="#5a5a5a" />
     <SolidColorBrush x:Key="Color21B" Color="#cccccc" />
     <SolidColorBrush x:Key="Color22B" Color="#f0f0f0" />
+    <SolidColorBrush x:Key="NumberBoxColor23B" Color="#f2f2f2" />
+    <SolidColorBrush x:Key="NumberBoxColor24B" Color="#f5f5f5" />
+    <SolidColorBrush x:Key="NumberBoxColor25B" Color="#878787" />
+    <SolidColorBrush x:Key="NumberBoxColor26B" Color="#1b1b1b" />
+    <SolidColorBrush x:Key="CustomNumberBoxBG" Color="#fdfdfd" />
+
     <SolidColorBrush x:Key="ThemeHoverButton" Color="#f6f6f6" />
     <SolidColorBrush x:Key="PopuBGColor" Color="#ffffff" />
     <SolidColorBrush x:Key="PopupTextColor" Color="#1b1b1b" />
@@ -56,6 +62,11 @@
     <Color x:Key="Color20">#5a5a5a</Color>
     <Color x:Key="Color21">#cccccc</Color>
     <Color x:Key="Color22">#f0f0f0</Color>
+    <Color x:Key="NumberBoxColor23">#f2f2f2</Color>
+    <Color x:Key="NumberBoxColor24">#f5f5f5</Color>
+    <Color x:Key="NumberBoxColor25">#878787</Color>
+    <Color x:Key="NumberBoxColor26">#1b1b1b</Color>
+
 
     <SolidColorBrush x:Key="ButtonOutBorder" Color="#e5e5e5" />
     <SolidColorBrush x:Key="ButtonInsideBorder" Color="#d3d3d3" />

Flow.Launcher/SettingWindow.xaml

@@ -2369,7 +2369,7 @@
                                 <Border Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
                                         <StackPanel Style="{StaticResource TextPanel}">
-                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="Developer" />
+                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="Developer's Tool" />
                                         </StackPanel>
                                         <StackPanel
                                             Grid.Column="1"