From 6d4946d6d891814dd0a5b469a81c25160f581ea9 Mon Sep 17 00:00:00 2001 From: DB p Date: Mon, 15 Nov 2021 15:43:28 +0900 Subject: [PATCH] - Add Dark Theme - Change Hardcoded Color to style --- Flow.Launcher/App.xaml | 29 +- .../Resources/CustomControlTemplate.xaml | 14 + Flow.Launcher/Resources/Dark.xaml | 1494 ++++++++++++++++ Flow.Launcher/Resources/Light.xaml | 1495 +++++++++++++++++ Flow.Launcher/SettingWindow.xaml | 248 +-- Flow.Launcher/SettingWindow.xaml.cs | 2 - 6 files changed, 3175 insertions(+), 107 deletions(-) create mode 100644 Flow.Launcher/Resources/Dark.xaml create mode 100644 Flow.Launcher/Resources/Light.xaml diff --git a/Flow.Launcher/App.xaml b/Flow.Launcher/App.xaml index 68ba806d2..9049f8e7e 100644 --- a/Flow.Launcher/App.xaml +++ b/Flow.Launcher/App.xaml @@ -1,13 +1,28 @@ - + - + + + + + + + + + + + + + + + diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml index bcb20579f..113b726a7 100644 --- a/Flow.Launcher/Resources/CustomControlTemplate.xaml +++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml @@ -5,6 +5,20 @@ xmlns:ui="http://schemas.modernwpf.com/2019"> + + + + + + + + + + - + @@ -415,7 +416,7 @@ Grid.Column="1" Margin="4,0,0,0" VerticalAlignment="Center" - FontSize="14" + FontSize="12" Text="{DynamicResource flowlauncher_settings}"> diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs index 9330e4921..1d969a24c 100644 --- a/Flow.Launcher/SettingWindow.xaml.cs +++ b/Flow.Launcher/SettingWindow.xaml.cs @@ -336,8 +336,6 @@ namespace Flow.Launcher this.restoreButton.Visibility = Visibility.Collapsed; } } - - private void Window_StateChanged(object sender, EventArgs e) { this.RefreshMaximizeRestoreButton();