From c2dcac18c7f1fe6cfd4e60a2d6fe971efdf117e4 Mon Sep 17 00:00:00 2001 From: DB p Date: Sat, 6 Nov 2021 13:21:13 +0900 Subject: [PATCH 01/15] 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 13d88e1c6f9..68ba806d276 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 00000000000..e4df44cdbcf --- /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 02/15] Change Switch Toggle Style --- Flow.Launcher/SettingWindow.xaml | 1902 +++++++++++++++++++----------- 1 file changed, 1246 insertions(+), 656 deletions(-) diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index 88a9172b0fb..2ba58a72005 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 @@ - + Date: Mon, 8 Nov 2021 19:57:58 +0900 Subject: [PATCH 05/15] Adjust Control Pressed Color --- .../Resources/CustomControlTemplate.xaml | 35 +++++++++++-------- Flow.Launcher/SettingWindow.xaml | 3 +- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml index cc27d5eb5d4..3720bac06fd 100644 --- a/Flow.Launcher/Resources/CustomControlTemplate.xaml +++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml @@ -92,7 +92,7 @@ - + @@ -116,9 +116,9 @@ - - - + + + @@ -536,6 +536,7 @@ TextWrapping="Wrap" Visibility="{TemplateBinding ui:ControlHelper.HeaderVisibility}" /> - + + - + + + - - - - - - + + + + + + + @@ -1531,9 +1536,9 @@ - - - + + + diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index b65b0abe428..bd9116bbad0 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -1759,7 +1759,7 @@ - + @@ -1837,6 +1837,7 @@ BorderThickness="1" /> From d5243ad3e5351e186dcb0be89e584c8a2229f13f Mon Sep 17 00:00:00 2001 From: DB p Date: Mon, 8 Nov 2021 20:51:00 +0900 Subject: [PATCH 06/15] Add Radio Button Style --- .../Resources/CustomControlTemplate.xaml | 141 ++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml index 3720bac06fd..70fb18e2df8 100644 --- a/Flow.Launcher/Resources/CustomControlTemplate.xaml +++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml @@ -4,6 +4,147 @@ xmlns:system="clr-namespace:System;assembly=mscorlib" xmlns:ui="http://schemas.modernwpf.com/2019"> + + + + - @@ -1518,15 +1540,15 @@ @@ -1534,7 +1556,7 @@ - + From 068ffdf6cd340d55319114dfb8288108644d899b Mon Sep 17 00:00:00 2001 From: DB p Date: Mon, 8 Nov 2021 23:26:24 +0900 Subject: [PATCH 09/15] - Adjust Priority Button --- Flow.Launcher/SettingWindow.xaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index 049b0aa0cc9..5c9e80a5a75 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -827,7 +827,7 @@ + TextWrapping="WrapWithOverflow"> @@ -838,10 +838,10 @@ VerticalAlignment="Center" FontSize="12" Text="{DynamicResource priority}" /> - + diff --git a/Flow.Launcher/PriorityChangeWindow.xaml.cs b/Flow.Launcher/PriorityChangeWindow.xaml.cs index 0adb1f08037..8f392f0a383 100644 --- a/Flow.Launcher/PriorityChangeWindow.xaml.cs +++ b/Flow.Launcher/PriorityChangeWindow.xaml.cs @@ -26,7 +26,6 @@ public partial class PriorityChangeWindow : Window private Settings settings; private readonly Internationalization translater = InternationalizationManager.Instance; private readonly PluginViewModel pluginViewModel; - public PriorityChangeWindow(string pluginId, Settings settings, PluginViewModel pluginViewModel) { InitializeComponent(); @@ -62,8 +61,18 @@ private void btnDone_OnClick(object sender, RoutedEventArgs e) private void PriorityChangeWindow_Loaded(object sender, RoutedEventArgs e) { - OldPriority.Text = pluginViewModel.Priority.ToString(); + tbAction.Text = pluginViewModel.Priority.ToString(); + //OldPriority.Text = pluginViewModel.Priority.ToString(); tbAction.Focus(); } + private void window_MouseDown(object sender, MouseButtonEventArgs e) /* for close hotkey popup */ + { + TextBox textBox = Keyboard.FocusedElement as TextBox; + if (textBox != null) + { + TraversalRequest tRequest = new TraversalRequest(FocusNavigationDirection.Next); + textBox.MoveFocus(tRequest); + } + } } } \ No newline at end of file diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml index 70fb18e2df8..cd956d26516 100644 --- a/Flow.Launcher/Resources/CustomControlTemplate.xaml +++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml @@ -4,6 +4,535 @@ xmlns:system="clr-namespace:System;assembly=mscorlib" xmlns:ui="http://schemas.modernwpf.com/2019"> + + + + + + + + + + + + + + + + + + + + + + + + +