From c2dcac18c7f1fe6cfd4e60a2d6fe971efdf117e4 Mon Sep 17 00:00:00 2001 From: DB p Date: Sat, 6 Nov 2021 13:21:13 +0900 Subject: [PATCH 1/4] wipSplit ControlTemplate from App.xaml --- Flow.Launcher/App.xaml | 222 +----- .../Resources/CustomControlTemplate.xaml | 719 ++++++++++++++++++ 2 files changed, 720 insertions(+), 221 deletions(-) create mode 100644 Flow.Launcher/Resources/CustomControlTemplate.xaml diff --git a/Flow.Launcher/App.xaml b/Flow.Launcher/App.xaml index 13d88e1c6..68ba806d2 100644 --- a/Flow.Launcher/App.xaml +++ b/Flow.Launcher/App.xaml @@ -6,230 +6,10 @@ Startup="OnStartupAsync"> - - - - - - - - + diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml new file mode 100644 index 000000000..e4df44cdb --- /dev/null +++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml @@ -0,0 +1,719 @@ + + + + 0:0:0.033 + 0:0:0.367 + 0.1,0.9 0.2,1.0 + + + + + + + + + + + + From 7a0d675ea68390ffdbdb1cc80572f40144e67329 Mon Sep 17 00:00:00 2001 From: DB p Date: Sun, 7 Nov 2021 15:50:44 +0900 Subject: [PATCH 2/4] Change Switch Toggle Style --- Flow.Launcher/SettingWindow.xaml | 1900 ++++++++++++++++++++---------- 1 file changed, 1245 insertions(+), 655 deletions(-) diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index 88a9172b0..2ba58a720 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -1,28 +1,30 @@ - + @@ -32,7 +34,7 @@ - + @@ -46,9 +48,15 @@ - + - + @@ -60,25 +68,25 @@ - - + + - - - + - - @@ -768,10 +934,14 @@ - - + + - + - + - - - + + + - - + + - + - - + + @@ -1175,9 +1540,11 @@ - - + + @@ -1185,41 +1552,73 @@ - + - + - + - - + + - - + + - - + + - - - - + + + + @@ -1233,26 +1632,47 @@ - + - - + + - - - - + + + + @@ -1266,8 +1686,12 @@ - + @@ -1276,17 +1700,25 @@ - + - + - - + + Visibility="{Binding ActionKeywordsVisibility}" /> @@ -1455,8 +1455,8 @@ - + @@ -1840,11 +1840,18 @@ BorderThickness="0" Style="{DynamicResource SettingGroupBox}"> - - + + - + @@ -2060,10 +2067,7 @@ - +