diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs index 606e6712dc8..2075137d0f5 100644 --- a/Flow.Launcher.Core/Resource/Theme.cs +++ b/Flow.Launcher.Core/Resource/Theme.cs @@ -137,18 +137,31 @@ public ResourceDictionary GetResourceDictionary() var dict = CurrentThemeResourceDictionary(); Style queryBoxStyle = dict["QueryBoxStyle"] as Style; - if (queryBoxStyle != null) + Style querySuggestionBoxStyle = dict["QuerySuggestionBoxStyle"] as Style; + + if (queryBoxStyle != null && querySuggestionBoxStyle != null) { - queryBoxStyle.Setters.Add(new Setter(TextBox.FontFamilyProperty, new FontFamily(Settings.QueryBoxFont))); - queryBoxStyle.Setters.Add(new Setter(TextBox.FontStyleProperty, FontHelper.GetFontStyleFromInvariantStringOrNormal(Settings.QueryBoxFontStyle))); - queryBoxStyle.Setters.Add(new Setter(TextBox.FontWeightProperty, FontHelper.GetFontWeightFromInvariantStringOrNormal(Settings.QueryBoxFontWeight))); - queryBoxStyle.Setters.Add(new Setter(TextBox.FontStretchProperty, FontHelper.GetFontStretchFromInvariantStringOrNormal(Settings.QueryBoxFontStretch))); + var fontFamily = new FontFamily(Settings.QueryBoxFont); + var fontStyle = FontHelper.GetFontStyleFromInvariantStringOrNormal(Settings.QueryBoxFontStyle); + var fontWeight = FontHelper.GetFontWeightFromInvariantStringOrNormal(Settings.QueryBoxFontWeight); + var fontStretch = FontHelper.GetFontStretchFromInvariantStringOrNormal(Settings.QueryBoxFontStretch); + + queryBoxStyle.Setters.Add(new Setter(TextBox.FontFamilyProperty, fontFamily)); + queryBoxStyle.Setters.Add(new Setter(TextBox.FontStyleProperty, fontStyle)); + queryBoxStyle.Setters.Add(new Setter(TextBox.FontWeightProperty, fontWeight)); + queryBoxStyle.Setters.Add(new Setter(TextBox.FontStretchProperty, fontStretch)); var caretBrushPropertyValue = queryBoxStyle.Setters.OfType().Any(x => x.Property.Name == "CaretBrush"); var foregroundPropertyValue = queryBoxStyle.Setters.OfType().Where(x => x.Property.Name == "Foreground") .Select(x => x.Value).FirstOrDefault(); if (!caretBrushPropertyValue && foregroundPropertyValue != null) //otherwise BaseQueryBoxStyle will handle styling queryBoxStyle.Setters.Add(new Setter(TextBox.CaretBrushProperty, foregroundPropertyValue)); + + // Query suggestion box's font style is aligned with query box + querySuggestionBoxStyle.Setters.Add(new Setter(TextBox.FontFamilyProperty, fontFamily)); + querySuggestionBoxStyle.Setters.Add(new Setter(TextBox.FontStyleProperty, fontStyle)); + querySuggestionBoxStyle.Setters.Add(new Setter(TextBox.FontWeightProperty, fontWeight)); + querySuggestionBoxStyle.Setters.Add(new Setter(TextBox.FontStretchProperty, fontStretch)); } Style resultItemStyle = dict["ItemTitleStyle"] as Style; diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml index 23ca5b677d7..0cc671ef65a 100644 --- a/Flow.Launcher/MainWindow.xaml +++ b/Flow.Launcher/MainWindow.xaml @@ -64,8 +64,7 @@ diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml index d8aed73ab50..eb2af490a30 100644 --- a/Flow.Launcher/Themes/Base.xaml +++ b/Flow.Launcher/Themes/Base.xaml @@ -1,6 +1,8 @@  + + + + + + #4F6180 \ No newline at end of file + + + + + + + + + + + + + #4F6180 + + + + + - + + diff --git a/Flow.Launcher/Themes/Gray.xaml b/Flow.Launcher/Themes/Gray.xaml index e52d4201beb..16a1db274aa 100644 --- a/Flow.Launcher/Themes/Gray.xaml +++ b/Flow.Launcher/Themes/Gray.xaml @@ -8,6 +8,13 @@ + + + + + + + + + diff --git a/Flow.Launcher/Themes/Pink.xaml b/Flow.Launcher/Themes/Pink.xaml index 93f2dee6e3a..d3130584b95 100644 --- a/Flow.Launcher/Themes/Pink.xaml +++ b/Flow.Launcher/Themes/Pink.xaml @@ -6,6 +6,12 @@ + + + diff --git a/SolutionAssemblyInfo.cs b/SolutionAssemblyInfo.cs index 9dce85a1ecc..0c45546dff8 100644 --- a/SolutionAssemblyInfo.cs +++ b/SolutionAssemblyInfo.cs @@ -16,6 +16,6 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("1.1.1")] -[assembly: AssemblyFileVersion("1.1.1")] -[assembly: AssemblyInformationalVersion("1.1.1")] \ No newline at end of file +[assembly: AssemblyVersion("1.1.2")] +[assembly: AssemblyFileVersion("1.1.2")] +[assembly: AssemblyInformationalVersion("1.1.2")] \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 81057e43a25..56fa840ab2a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: '1.1.1.{build}' +version: '1.1.2.{build}' init: - ps: |