From c94e47bddb35fb7923c67a3843c2f0f66419be28 Mon Sep 17 00:00:00 2001 From: DB p Date: Sat, 18 May 2024 19:45:39 +0900 Subject: [PATCH 01/25] - Adjust Themes --- Flow.Launcher/MainWindow.xaml | 5 +- Flow.Launcher/Resources/Dark.xaml | 3 +- Flow.Launcher/Resources/Light.xaml | 3 +- Flow.Launcher/Themes/Base.xaml | 19 +- Flow.Launcher/Themes/Bullet Light.xaml | 209 ------------------ Flow.Launcher/Themes/Circle Light.xaml | 190 ---------------- Flow.Launcher/Themes/Cyan Dark.xaml | 6 +- Flow.Launcher/Themes/Darker Glass.xaml | 174 --------------- Flow.Launcher/Themes/Discord Dark.xaml | 192 ---------------- Flow.Launcher/Themes/Dracula.xaml | 3 +- Flow.Launcher/Themes/Gray.xaml | 1 - Flow.Launcher/Themes/League.xaml | 165 -------------- Flow.Launcher/Themes/Nord Darker.xaml | 1 - Flow.Launcher/Themes/Pink.xaml | 161 -------------- Flow.Launcher/Themes/SlimLight.xaml | 17 +- Flow.Launcher/Themes/Sublime.xaml | 1 - Flow.Launcher/Themes/Ubuntu.xaml | 4 +- Flow.Launcher/Themes/Win10Light.xaml | 199 ----------------- Flow.Launcher/Themes/Win11Dark.xaml | 195 ---------------- Flow.Launcher/Themes/Win11System.xaml | 143 ++++++------ .../{Win11Light.xaml => Win11SystemFlat.xaml} | 80 ++++--- 21 files changed, 154 insertions(+), 1617 deletions(-) delete mode 100644 Flow.Launcher/Themes/Bullet Light.xaml delete mode 100644 Flow.Launcher/Themes/Circle Light.xaml delete mode 100644 Flow.Launcher/Themes/Darker Glass.xaml delete mode 100644 Flow.Launcher/Themes/Discord Dark.xaml delete mode 100644 Flow.Launcher/Themes/League.xaml delete mode 100644 Flow.Launcher/Themes/Pink.xaml delete mode 100644 Flow.Launcher/Themes/Win10Light.xaml delete mode 100644 Flow.Launcher/Themes/Win11Dark.xaml rename Flow.Launcher/Themes/{Win11Light.xaml => Win11SystemFlat.xaml} (69%) diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml index 34b6dfcdc97..adecfa2baf1 100644 --- a/Flow.Launcher/MainWindow.xaml +++ b/Flow.Launcher/MainWindow.xaml @@ -29,7 +29,6 @@ ResizeMode="NoResize" ShowInTaskbar="False" SizeToContent="Height" - Style="{DynamicResource WindowStyle}" Topmost="True" Visibility="{Binding MainWindowVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" WindowStartupLocation="Manual" @@ -308,11 +307,11 @@ - + @@ -17,6 +17,7 @@ + #198F8F8F diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml index 6e06b99af5a..fe0f2dbe13b 100644 --- a/Flow.Launcher/Resources/Light.xaml +++ b/Flow.Launcher/Resources/Light.xaml @@ -7,7 +7,7 @@ xmlns:sys="clr-namespace:System;assembly=mscorlib"> - + @@ -17,6 +17,7 @@ + #198F8F8F diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml index 2ba3a592966..af41ff4b38c 100644 --- a/Flow.Launcher/Themes/Base.xaml +++ b/Flow.Launcher/Themes/Base.xaml @@ -29,7 +29,7 @@ - + @@ -69,7 +69,7 @@ @@ -120,13 +122,15 @@ @@ -139,6 +143,7 @@ + @@ -413,7 +418,7 @@ @@ -495,7 +500,7 @@ @@ -503,7 +508,7 @@ x:Key="ClockPanelPosition" BasedOn="{StaticResource BaseClockPanelPosition}" TargetType="{x:Type Canvas}"> - + - - - - - - - - - - - - - #f1f1f1 - - - - - - - - - - 5 - 10 0 10 0 - 0 0 0 10 - - - - - - - - \ No newline at end of file diff --git a/Flow.Launcher/Themes/Circle Light.xaml b/Flow.Launcher/Themes/Circle Light.xaml deleted file mode 100644 index e52e3a9570f..00000000000 --- a/Flow.Launcher/Themes/Circle Light.xaml +++ /dev/null @@ -1,190 +0,0 @@ - - - - - - - - - - - - - - - - - #5046e5 - - - - - - - - - - 8 - 10 0 10 0 - 0 0 0 10 - - - - - - - - diff --git a/Flow.Launcher/Themes/Cyan Dark.xaml b/Flow.Launcher/Themes/Cyan Dark.xaml index 60bc090022f..106b1b6d90e 100644 --- a/Flow.Launcher/Themes/Cyan Dark.xaml +++ b/Flow.Launcher/Themes/Cyan Dark.xaml @@ -27,7 +27,7 @@ x:Key="ItemGlyph" BasedOn="{StaticResource BaseGlyphStyle}" TargetType="{x:Type TextBlock}"> - + - - - - - - - - - - - - - #545454 - - - - - - - - - - - - - - - - diff --git a/Flow.Launcher/Themes/Discord Dark.xaml b/Flow.Launcher/Themes/Discord Dark.xaml deleted file mode 100644 index 5315c7644a1..00000000000 --- a/Flow.Launcher/Themes/Discord Dark.xaml +++ /dev/null @@ -1,192 +0,0 @@ - - - - - 0 0 0 6 - - - - - - - - - - - - - - #49443c - - - - - - - - - - - - - - - diff --git a/Flow.Launcher/Themes/Dracula.xaml b/Flow.Launcher/Themes/Dracula.xaml index d150e7355fe..eb8cc9557fb 100644 --- a/Flow.Launcher/Themes/Dracula.xaml +++ b/Flow.Launcher/Themes/Dracula.xaml @@ -28,7 +28,6 @@ x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}"> - @@ -98,7 +97,7 @@ - - - - - - - - - - - - - #192026 - - - - - - F1 M12000,12000z M0,0z M10354,10962C10326,10951 10279,10927 10249,10907 10216,10886 9476,10153 8370,9046 7366,8042 6541,7220 6536,7220 6532,7220 6498,7242 6461,7268 6213,7447 5883,7619 5592,7721 5194,7860 4802,7919 4360,7906 3612,7886 2953,7647 2340,7174 2131,7013 1832,6699 1664,6465 1394,6088 1188,5618 1097,5170 1044,4909 1030,4764 1030,4470 1030,4130 1056,3914 1135,3609 1263,3110 1511,2633 1850,2235 1936,2134 2162,1911 2260,1829 2781,1395 3422,1120 4090,1045 4271,1025 4667,1025 4848,1045 5505,1120 6100,1368 6630,1789 6774,1903 7081,2215 7186,2355 7362,2588 7467,2759 7579,2990 7802,3455 7911,3937 7911,4460 7911,4854 7861,5165 7737,5542 7684,5702 7675,5724 7602,5885 7517,6071 7390,6292 7270,6460 7242,6499 7220,6533 7220,6538 7220,6542 8046,7371 9055,8380 10441,9766 10898,10229 10924,10274 10945,10308 10966,10364 10976,10408 10990,10472 10991,10493 10980,10554 10952,10717 10840,10865 10690,10937 10621,10971 10607,10974 10510,10977 10425,10980 10395,10977 10354,10962z M4685,7050C5214,7001 5694,6809 6100,6484 6209,6396 6396,6209 6484,6100 7151,5267 7246,4110 6721,3190 6369,2571 5798,2137 5100,1956 4706,1855 4222,1855 3830,1957 3448,2056 3140,2210 2838,2453 2337,2855 2010,3427 1908,4080 1877,4274 1877,4656 1908,4850 1948,5105 2028,5370 2133,5590 2459,6272 3077,6782 3810,6973 3967,7014 4085,7034 4290,7053 4371,7061 4583,7059 4685,7050z - - - - - - - - \ No newline at end of file diff --git a/Flow.Launcher/Themes/Nord Darker.xaml b/Flow.Launcher/Themes/Nord Darker.xaml index d9ddb307664..bb5dbf87f2b 100644 --- a/Flow.Launcher/Themes/Nord Darker.xaml +++ b/Flow.Launcher/Themes/Nord Darker.xaml @@ -22,7 +22,6 @@ x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}"> - diff --git a/Flow.Launcher/Themes/Pink.xaml b/Flow.Launcher/Themes/Pink.xaml deleted file mode 100644 index dc97e432055..00000000000 --- a/Flow.Launcher/Themes/Pink.xaml +++ /dev/null @@ -1,161 +0,0 @@ - - - - - 0 0 0 4 - - - - - - - - - - - - - #cc1081 - - - - - - - - - - - - \ No newline at end of file diff --git a/Flow.Launcher/Themes/SlimLight.xaml b/Flow.Launcher/Themes/SlimLight.xaml index dc08eec3003..078b07048c3 100644 --- a/Flow.Launcher/Themes/SlimLight.xaml +++ b/Flow.Launcher/Themes/SlimLight.xaml @@ -179,15 +179,28 @@ BasedOn="{StaticResource BaseClockBox}" TargetType="{x:Type TextBlock}"> - + + + + + + + + - - - - - - - - - - - - - - - #ccd0d4 - - - - - - - - - - - - - - - diff --git a/Flow.Launcher/Themes/Win11Dark.xaml b/Flow.Launcher/Themes/Win11Dark.xaml deleted file mode 100644 index 5abb96cce0d..00000000000 --- a/Flow.Launcher/Themes/Win11Dark.xaml +++ /dev/null @@ -1,195 +0,0 @@ - - - - - 0 0 0 8 - - - - - - - - - - - - - - - #198F8F8F - - - - - - - - - - - - - - - diff --git a/Flow.Launcher/Themes/Win11System.xaml b/Flow.Launcher/Themes/Win11System.xaml index 3025f9a07e2..2f677804c13 100644 --- a/Flow.Launcher/Themes/Win11System.xaml +++ b/Flow.Launcher/Themes/Win11System.xaml @@ -3,61 +3,70 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:m="http://schemas.modernwpf.com/2019" xmlns:system="clr-namespace:System;assembly=mscorlib"> + - 0 0 0 8 + + + - + TargetType="{x:Type Window}" /> + - - - - + + + + + + + 5 + 10 0 10 0 + 0 0 0 10 + - + \ No newline at end of file diff --git a/Flow.Launcher/Themes/Win11Light.xaml b/Flow.Launcher/Themes/Win11SystemFlat.xaml similarity index 69% rename from Flow.Launcher/Themes/Win11Light.xaml rename to Flow.Launcher/Themes/Win11SystemFlat.xaml index e6f376f8b34..2f5e0d237d2 100644 --- a/Flow.Launcher/Themes/Win11Light.xaml +++ b/Flow.Launcher/Themes/Win11SystemFlat.xaml @@ -1,6 +1,7 @@ @@ -10,23 +11,22 @@ x:Key="ItemGlyph" BasedOn="{StaticResource BaseGlyphStyle}" TargetType="{x:Type TextBlock}"> - + @@ -46,25 +45,15 @@ BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}"> - + - - - - - - - - - - + - #198F8F8F + @@ -164,46 +155,53 @@ x:Key="SearchIconStyle" BasedOn="{StaticResource BaseSearchIconStyle}" TargetType="{x:Type Path}"> - + + + + + + From 2b14bc460458e80ccd010f19f9f842af3f638188 Mon Sep 17 00:00:00 2001 From: DB p Date: Sat, 18 May 2024 20:35:04 +0900 Subject: [PATCH 02/25] Fix font Size --- Flow.Launcher/Themes/Win11SystemFlat.xaml | 1 - 1 file changed, 1 deletion(-) diff --git a/Flow.Launcher/Themes/Win11SystemFlat.xaml b/Flow.Launcher/Themes/Win11SystemFlat.xaml index 2f5e0d237d2..b4f1cfd8c55 100644 --- a/Flow.Launcher/Themes/Win11SystemFlat.xaml +++ b/Flow.Launcher/Themes/Win11SystemFlat.xaml @@ -27,7 +27,6 @@ - From e87af5d4a40d01de1a0cace3e713a2245273e146 Mon Sep 17 00:00:00 2001 From: DB p Date: Mon, 20 May 2024 17:53:45 +0900 Subject: [PATCH 03/25] Adjust Height win11System --- Flow.Launcher/Themes/Win11System.xaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Flow.Launcher/Themes/Win11System.xaml b/Flow.Launcher/Themes/Win11System.xaml index 2f677804c13..330771c52e7 100644 --- a/Flow.Launcher/Themes/Win11System.xaml +++ b/Flow.Launcher/Themes/Win11System.xaml @@ -40,7 +40,7 @@ - + From 82e99443ff83773e21aeb366d394ba7eadf12d50 Mon Sep 17 00:00:00 2001 From: DB p Date: Tue, 28 May 2024 19:52:39 +0900 Subject: [PATCH 04/25] Rename Theme --- Flow.Launcher/Themes/{Win11SystemFlat.xaml => Win10System.xaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Flow.Launcher/Themes/{Win11SystemFlat.xaml => Win10System.xaml} (100%) diff --git a/Flow.Launcher/Themes/Win11SystemFlat.xaml b/Flow.Launcher/Themes/Win10System.xaml similarity index 100% rename from Flow.Launcher/Themes/Win11SystemFlat.xaml rename to Flow.Launcher/Themes/Win10System.xaml From e060e2f4932d01e00a172a264e25dea0eff5e697 Mon Sep 17 00:00:00 2001 From: DB p Date: Wed, 29 May 2024 22:54:15 +0900 Subject: [PATCH 05/25] - Change Default Theme Name (win11Light to win11System) - Change UseDropShadowEffect to true --- Flow.Launcher.Infrastructure/Constant.cs | 2 +- Flow.Launcher.Infrastructure/UserSettings/Settings.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Flow.Launcher.Infrastructure/Constant.cs b/Flow.Launcher.Infrastructure/Constant.cs index 8a95ee79f77..464a2cbdedd 100644 --- a/Flow.Launcher.Infrastructure/Constant.cs +++ b/Flow.Launcher.Infrastructure/Constant.cs @@ -37,7 +37,7 @@ public static class Constant public static readonly string QueryTextBoxIconImagePath = $"{ProgramDirectory}\\Images\\mainsearch.svg"; - public const string DefaultTheme = "Win11Light"; + public const string DefaultTheme = "Win11System"; public const string Light = "Light"; public const string Dark = "Dark"; diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs index 6528f626c23..7396a5bb2e5 100644 --- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs +++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs @@ -55,7 +55,7 @@ public string Theme OnPropertyChanged(nameof(MaxResultsToShow)); } } - public bool UseDropShadowEffect { get; set; } = false; + public bool UseDropShadowEffect { get; set; } = true; /* Appearance Settings. It should be separated from the setting later.*/ public double WindowHeightSize { get; set; } = 42; From 4ec7647d8c513c3f7b294c915d365e1473e81346 Mon Sep 17 00:00:00 2001 From: Yusyuriv Date: Sun, 2 Jun 2024 18:17:42 +0600 Subject: [PATCH 06/25] Add theme metadata --- Flow.Launcher.Core/Resource/Theme.cs | 60 ++++++++++++++++--- .../ViewModels/SettingsPaneThemeViewModel.cs | 3 +- .../SettingPages/Views/SettingsPaneTheme.xaml | 5 +- Flow.Launcher/Themes/Win11System.xaml | 5 ++ 4 files changed, 62 insertions(+), 11 deletions(-) diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs index 61f0b18e0ef..1c7485a9c24 100644 --- a/Flow.Launcher.Core/Resource/Theme.cs +++ b/Flow.Launcher.Core/Resource/Theme.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using System.Xml; using System.Runtime.InteropServices; using System.Windows; using System.Windows.Controls; @@ -219,17 +220,60 @@ private ResourceDictionary GetCurrentResourceDictionary( ) return GetResourceDictionary(Settings.Theme); } - public List LoadAvailableThemes() + public List LoadAvailableThemes() { - List themes = new List(); + List themes = new List(); foreach (var themeDirectory in _themeDirectories) { - themes.AddRange( - Directory.GetFiles(themeDirectory) - .Where(filePath => filePath.EndsWith(Extension) && !filePath.EndsWith("Base.xaml")) - .ToList()); + var filePaths = Directory + .GetFiles(themeDirectory) + .Where(filePath => filePath.EndsWith(Extension) && !filePath.EndsWith("Base.xaml")) + .Select(GetThemeDataFromPath); + themes.AddRange(filePaths); } - return themes.OrderBy(o => o).ToList(); + + return themes.OrderBy(o => o.Name).ToList(); + } + + private ThemeData GetThemeDataFromPath(string path) + { + using var reader = XmlReader.Create(path); + reader.Read(); + + var extensionlessName = Path.GetFileNameWithoutExtension(path); + + if (reader.NodeType is not XmlNodeType.Comment) + return new ThemeData(extensionlessName, extensionlessName); + + var commentLines = reader.Value.Trim().Split('\n').Select(v => v.Trim()); + var themeData = new ThemeData(extensionlessName, extensionlessName); + foreach (var line in commentLines) + { + if (line.StartsWith("Name:", StringComparison.OrdinalIgnoreCase)) + { + themeData = themeData with { Name = line.Remove(0, "Name:".Length).Trim() }; + } + else if (line.StartsWith("IsDark:", StringComparison.OrdinalIgnoreCase)) + { + themeData = themeData with + { + IsDark = bool.Parse( + line.Remove(0, "IsDark:".Length).Trim() + ) + }; + } + else if (line.StartsWith("BlurAmount:", StringComparison.OrdinalIgnoreCase)) + { + themeData = themeData with + { + BlurAmount = int.Parse( + line.Remove(0, "BlurAmount:".Length).Trim() + ) + }; + } + } + + return themeData; } private string GetThemePath(string themeName) @@ -407,5 +451,7 @@ private void SetWindowAccent(Window w, AccentState state) Marshal.FreeHGlobal(accentPtr); } #endregion + + public record ThemeData(string FileNameWithoutExtension, string Name, bool? IsDark = null, int? BlurAmount = null); } } diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs index 5046a475481..bac29bfcd8b 100644 --- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs +++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs @@ -91,8 +91,7 @@ public double ResultSubItemFontSize get => Settings.ResultSubItemFontSize; set => Settings.ResultSubItemFontSize = value; } - public List Themes => - ThemeManager.Instance.LoadAvailableThemes().Select(Path.GetFileNameWithoutExtension).ToList(); + public List Themes => ThemeManager.Instance.LoadAvailableThemes(); public class ColorScheme diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml index 08b49e745bb..0c89ea19533 100644 --- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml +++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml @@ -409,7 +409,8 @@ ItemsSource="{Binding Themes}" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Disabled" - SelectedItem="{Binding SelectedTheme}"> + SelectedValue="{Binding SelectedTheme}" + SelectedValuePath="FileNameWithoutExtension"> @@ -150,7 +155,7 @@ x:Key="ClockPanel" BasedOn="{StaticResource ClockPanel}" TargetType="{x:Type StackPanel}"> - + @@ -163,7 +163,7 @@ - + @@ -175,7 +175,7 @@ x:Key="ClockPanel" BasedOn="{StaticResource ClockPanel}" TargetType="{x:Type StackPanel}"> - + + @@ -123,8 +165,8 @@ x:Name="Spacer" Width="Auto" Height="Auto" - Margin="0,10,5,0" - Padding="0,0,0,0" + Margin="0 10 5 0" + Padding="0 0 0 0" BorderBrush="Transparent" BorderThickness="0"> @@ -180,7 +222,7 @@ Grid.Column="0" Width="4" Height="18" - Margin="0,11,0,11" + Margin="0 11 0 11" Fill="{DynamicResource ToggleSwitchFillOn}" RadiusX="2" RadiusY="2" @@ -188,7 +230,7 @@ - + - + @@ -255,7 +297,7 @@ - + @@ -267,7 +309,7 @@ - + @@ -284,10 +326,10 @@ - - - - - - - + + + + + - - - - - - - - - + + Date: Mon, 3 Jun 2024 01:21:43 +0900 Subject: [PATCH 11/25] Add Selected Item TextBlock --- Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml index ff6af7cd18b..d7051497bae 100644 --- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml +++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml @@ -379,12 +379,15 @@ - + + + Date: Sun, 2 Jun 2024 22:35:58 +0600 Subject: [PATCH 12/25] Convert SelectedTheme from string to record --- .../SettingPages/ViewModels/SettingsPaneThemeViewModel.cs | 8 +++++--- Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml | 3 +-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs index bac29bfcd8b..64b138a0a45 100644 --- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs +++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs @@ -27,12 +27,14 @@ public partial class SettingsPaneThemeViewModel : BaseModel public static string LinkHowToCreateTheme => @"https://flowlauncher.com/docs/#/how-to-create-a-theme"; public static string LinkThemeGallery => "https://github.com/Flow-Launcher/Flow.Launcher/discussions/1438"; - public string SelectedTheme + private Theme.ThemeData _selectedTheme; + public Theme.ThemeData SelectedTheme { - get => Settings.Theme; + get => _selectedTheme ??= Themes.Find(v => v.FileNameWithoutExtension == Settings.Theme); set { - ThemeManager.Instance.ChangeTheme(value); + _selectedTheme = value; + ThemeManager.Instance.ChangeTheme(value.FileNameWithoutExtension); if (ThemeManager.Instance.BlurEnabled && Settings.UseDropShadowEffect) DropShadowEffect = false; diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml index d7051497bae..b5d35606c60 100644 --- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml +++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml @@ -401,8 +401,7 @@ ItemsSource="{Binding Themes}" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Auto" - SelectedValue="{Binding SelectedTheme}" - SelectedValuePath="FileNameWithoutExtension"> + SelectedValue="{Binding SelectedTheme}"> From 0d9f207915a58f7fabd6b7f616a6419db30c78a5 Mon Sep 17 00:00:00 2001 From: DB p Date: Mon, 3 Jun 2024 03:12:12 +0900 Subject: [PATCH 13/25] Add FontIcon --- .../SettingPages/Views/SettingsPaneTheme.xaml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml index b5d35606c60..349cbf4abea 100644 --- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml +++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml @@ -384,10 +384,20 @@ Margin="0 8 0 0" Icon=""> - + - - + + Date: Mon, 3 Jun 2024 06:31:14 +0900 Subject: [PATCH 14/25] - Adjust Themes / Preview Margin - Fix GridSplitter Margin --- Flow.Launcher/MainWindow.xaml | 15 +- .../Resources/SettingWindowStyle.xaml | 1 - .../SettingPages/Views/SettingsPaneTheme.xaml | 6 +- Flow.Launcher/Themes/Base.xaml | 23 ++- Flow.Launcher/Themes/Darker Glass.xaml | 174 ++++++++++++++++ Flow.Launcher/Themes/Discord Dark.xaml | 192 ++++++++++++++++++ Flow.Launcher/Themes/League.xaml | 165 +++++++++++++++ Flow.Launcher/Themes/Pink.xaml | 164 +++++++++++++++ .../Views/PreviewPanel.xaml | 26 +-- 9 files changed, 741 insertions(+), 25 deletions(-) create mode 100644 Flow.Launcher/Themes/Darker Glass.xaml create mode 100644 Flow.Launcher/Themes/Discord Dark.xaml create mode 100644 Flow.Launcher/Themes/League.xaml create mode 100644 Flow.Launcher/Themes/Pink.xaml diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml index e1970f5ba3a..f56b8d8bff7 100644 --- a/Flow.Launcher/MainWindow.xaml +++ b/Flow.Launcher/MainWindow.xaml @@ -441,12 +441,18 @@ + ShowsPreview="True" + Visibility="{Binding PreviewVisible, Converter={StaticResource BoolToVisibilityConverter}}"> + + + + + + @@ -532,9 +537,9 @@ diff --git a/Flow.Launcher/Resources/SettingWindowStyle.xaml b/Flow.Launcher/Resources/SettingWindowStyle.xaml index e0547b2c58c..41c11e34644 100644 --- a/Flow.Launcher/Resources/SettingWindowStyle.xaml +++ b/Flow.Launcher/Resources/SettingWindowStyle.xaml @@ -55,7 +55,6 @@ @@ -143,7 +143,7 @@ - + @@ -409,10 +409,24 @@ + + + + + + + + + + + + + + #545454 + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Flow.Launcher/Themes/Discord Dark.xaml b/Flow.Launcher/Themes/Discord Dark.xaml new file mode 100644 index 00000000000..9e39ee5bdaf --- /dev/null +++ b/Flow.Launcher/Themes/Discord Dark.xaml @@ -0,0 +1,192 @@ + + + + + 0 0 0 6 + + + + + + + + + + + + + + #49443c + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Flow.Launcher/Themes/League.xaml b/Flow.Launcher/Themes/League.xaml new file mode 100644 index 00000000000..f1c8ba19222 --- /dev/null +++ b/Flow.Launcher/Themes/League.xaml @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + #192026 + + + + + + F1 M12000,12000z M0,0z M10354,10962C10326,10951 10279,10927 10249,10907 10216,10886 9476,10153 8370,9046 7366,8042 6541,7220 6536,7220 6532,7220 6498,7242 6461,7268 6213,7447 5883,7619 5592,7721 5194,7860 4802,7919 4360,7906 3612,7886 2953,7647 2340,7174 2131,7013 1832,6699 1664,6465 1394,6088 1188,5618 1097,5170 1044,4909 1030,4764 1030,4470 1030,4130 1056,3914 1135,3609 1263,3110 1511,2633 1850,2235 1936,2134 2162,1911 2260,1829 2781,1395 3422,1120 4090,1045 4271,1025 4667,1025 4848,1045 5505,1120 6100,1368 6630,1789 6774,1903 7081,2215 7186,2355 7362,2588 7467,2759 7579,2990 7802,3455 7911,3937 7911,4460 7911,4854 7861,5165 7737,5542 7684,5702 7675,5724 7602,5885 7517,6071 7390,6292 7270,6460 7242,6499 7220,6533 7220,6538 7220,6542 8046,7371 9055,8380 10441,9766 10898,10229 10924,10274 10945,10308 10966,10364 10976,10408 10990,10472 10991,10493 10980,10554 10952,10717 10840,10865 10690,10937 10621,10971 10607,10974 10510,10977 10425,10980 10395,10977 10354,10962z M4685,7050C5214,7001 5694,6809 6100,6484 6209,6396 6396,6209 6484,6100 7151,5267 7246,4110 6721,3190 6369,2571 5798,2137 5100,1956 4706,1855 4222,1855 3830,1957 3448,2056 3140,2210 2838,2453 2337,2855 2010,3427 1908,4080 1877,4274 1877,4656 1908,4850 1948,5105 2028,5370 2133,5590 2459,6272 3077,6782 3810,6973 3967,7014 4085,7034 4290,7053 4371,7061 4583,7059 4685,7050z + + + + + + + + \ No newline at end of file diff --git a/Flow.Launcher/Themes/Pink.xaml b/Flow.Launcher/Themes/Pink.xaml new file mode 100644 index 00000000000..d6f9813d001 --- /dev/null +++ b/Flow.Launcher/Themes/Pink.xaml @@ -0,0 +1,164 @@ + + + + + 0 0 0 0 + + + + + + + + + + + + + #0e172c + + + + + + + + + + + + \ No newline at end of file diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml index e81340de67b..a2910f23067 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml @@ -10,7 +10,7 @@ mc:Ignorable="d"> @@ -23,7 +23,7 @@ 5 - 10 0 10 0 - 0 0 0 10 + 10 0 5 0 + 0 10 0 10 - \ No newline at end of file + diff --git a/Flow.Launcher/Themes/BlurWhite.xaml b/Flow.Launcher/Themes/BlurWhite.xaml index 75f61ee47a5..a13f3bfcc77 100644 --- a/Flow.Launcher/Themes/BlurWhite.xaml +++ b/Flow.Launcher/Themes/BlurWhite.xaml @@ -1,7 +1,7 @@  - \ No newline at end of file + diff --git a/Flow.Launcher/Themes/Win10System.xaml b/Flow.Launcher/Themes/Win10System.xaml index 1b785329fa0..0b041bc0987 100644 --- a/Flow.Launcher/Themes/Win10System.xaml +++ b/Flow.Launcher/Themes/Win10System.xaml @@ -1,7 +1,7 @@ - \ No newline at end of file + From b37f21a4b579a2dd08dce11cea4c484b586e7c32 Mon Sep 17 00:00:00 2001 From: DB p Date: Tue, 4 Jun 2024 04:06:08 +0900 Subject: [PATCH 18/25] Fix Wrong Item Focusing --- Flow.Launcher/MainWindow.xaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml index f56b8d8bff7..0979dcaecb8 100644 --- a/Flow.Launcher/MainWindow.xaml +++ b/Flow.Launcher/MainWindow.xaml @@ -460,7 +460,7 @@ Style="{DynamicResource PreviewArea}" Visibility="{Binding PreviewVisible, Converter={StaticResource BoolToVisibilityConverter}}"> @@ -535,7 +535,7 @@ Date: Tue, 4 Jun 2024 04:07:59 +0900 Subject: [PATCH 19/25] Revert "Fix Wrong Item Focusing" This reverts commit b37f21a4b579a2dd08dce11cea4c484b586e7c32. --- Flow.Launcher/MainWindow.xaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml index 0979dcaecb8..f56b8d8bff7 100644 --- a/Flow.Launcher/MainWindow.xaml +++ b/Flow.Launcher/MainWindow.xaml @@ -460,7 +460,7 @@ Style="{DynamicResource PreviewArea}" Visibility="{Binding PreviewVisible, Converter={StaticResource BoolToVisibilityConverter}}"> @@ -535,7 +535,7 @@ Date: Tue, 4 Jun 2024 04:14:00 +0900 Subject: [PATCH 20/25] Adjust System Themes Color --- Flow.Launcher/Resources/Dark.xaml | 4 ++-- Flow.Launcher/Resources/Light.xaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml index 16e29a8e9e8..0bdb3d167b2 100644 --- a/Flow.Launcher/Resources/Dark.xaml +++ b/Flow.Launcher/Resources/Dark.xaml @@ -11,8 +11,8 @@ - - + + diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml index 91cbc6cbb66..a59e72c3819 100644 --- a/Flow.Launcher/Resources/Light.xaml +++ b/Flow.Launcher/Resources/Light.xaml @@ -11,8 +11,8 @@ - - + + From d35c96d8f2acee018492e3fd848db7279a25977c Mon Sep 17 00:00:00 2001 From: DB p Date: Tue, 4 Jun 2024 05:15:58 +0900 Subject: [PATCH 21/25] Adjust Color --- Flow.Launcher/Resources/Dark.xaml | 2 +- Flow.Launcher/Resources/Light.xaml | 4 ++-- Flow.Launcher/Themes/Win10System.xaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml index c16dba18f7d..ed031c939e0 100644 --- a/Flow.Launcher/Resources/Dark.xaml +++ b/Flow.Launcher/Resources/Dark.xaml @@ -11,7 +11,7 @@ - + diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml index b2a57167657..8fe84588f5e 100644 --- a/Flow.Launcher/Resources/Light.xaml +++ b/Flow.Launcher/Resources/Light.xaml @@ -11,13 +11,13 @@ - + - + #198F8F8F diff --git a/Flow.Launcher/Themes/Win10System.xaml b/Flow.Launcher/Themes/Win10System.xaml index 0b041bc0987..4f8ea553290 100644 --- a/Flow.Launcher/Themes/Win10System.xaml +++ b/Flow.Launcher/Themes/Win10System.xaml @@ -175,13 +175,13 @@ x:Key="ClockBox" BasedOn="{StaticResource BaseClockBox}" TargetType="{x:Type TextBlock}"> - + + + + + + + + + - - - + + + + - - - - - - - - - - - - + + + + + - + From 4865ae3b4f71ccbd814b5abfb2d5c81399f51e8b Mon Sep 17 00:00:00 2001 From: DB p Date: Tue, 4 Jun 2024 06:50:08 +0900 Subject: [PATCH 25/25] Fixed scroll wheel not working in the theme list --- .../SettingPages/Views/SettingsPaneTheme.xaml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml index 388ea856fa3..60f9f6b3816 100644 --- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml +++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml @@ -407,16 +407,13 @@ @@ -428,7 +425,8 @@ + Margin="0" + Focusable="True"> + + + + + + +