From 1d674c4d0e2a71a95a8533d2d2700cd0c576173e Mon Sep 17 00:00:00 2001 From: DB p Date: Sat, 19 Nov 2022 00:03:01 +0900 Subject: [PATCH] Split Preview Style --- Flow.Launcher/MainWindow.xaml | 198 +++++++++++---------- Flow.Launcher/Themes/Atom.xaml | 17 +- Flow.Launcher/Themes/Base.xaml | 35 +++- Flow.Launcher/Themes/BlackAndWhite.xaml | 74 ++++++-- Flow.Launcher/Themes/BlurBlack Darker.xaml | 13 ++ Flow.Launcher/Themes/BlurBlack.xaml | 12 ++ Flow.Launcher/Themes/BlurWhite.xaml | 12 ++ Flow.Launcher/Themes/Darker Glass.xaml | 19 +- Flow.Launcher/Themes/Darker.xaml | 12 ++ Flow.Launcher/Themes/Discord Dark.xaml | 19 +- Flow.Launcher/Themes/Dracula.xaml | 20 ++- Flow.Launcher/Themes/Gray.xaml | 12 ++ Flow.Launcher/Themes/League.xaml | 19 +- Flow.Launcher/Themes/Light.xaml | 119 +++++++++---- Flow.Launcher/Themes/Metro Server.xaml | 17 +- Flow.Launcher/Themes/Nord Darker.xaml | 14 +- Flow.Launcher/Themes/Nord.xaml | 17 +- Flow.Launcher/Themes/Pink.xaml | 13 ++ Flow.Launcher/Themes/Sublime.xaml | 17 +- Flow.Launcher/Themes/Win10Light.xaml | 17 +- Flow.Launcher/Themes/Win11Dark.xaml | 17 +- Flow.Launcher/Themes/Win11Light.xaml | 12 ++ Flow.Launcher/Themes/Win11System.xaml | 19 +- 23 files changed, 565 insertions(+), 159 deletions(-) diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml index cb7cc07ae..8a9e026a2 100644 --- a/Flow.Launcher/MainWindow.xaml +++ b/Flow.Launcher/MainWindow.xaml @@ -1,4 +1,5 @@ - - - - - - + + + + - - - - - - - - - - - + + - - - - + - - - - - - - - - - - - + - - - - + + + - - + - - - - + + + - - + + - + - + Text="{Binding DateText}" + Visibility="{Binding Settings.UseDate, Converter={StaticResource BooleanToVisibilityConverter}}" /> + - - - - + Style="{DynamicResource PreviewItemSubTitleStyle}" + Text="{Binding Result.SubTitle}" /> diff --git a/Flow.Launcher/Themes/Atom.xaml b/Flow.Launcher/Themes/Atom.xaml index c1fcd90d1..87c2e6e83 100644 --- a/Flow.Launcher/Themes/Atom.xaml +++ b/Flow.Launcher/Themes/Atom.xaml @@ -167,7 +167,22 @@ TargetType="{x:Type TextBlock}"> - + + diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml index 92b842c69..0bc64ddfd 100644 --- a/Flow.Launcher/Themes/Base.xaml +++ b/Flow.Launcher/Themes/Base.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib" xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"> - + + + + + + + + diff --git a/Flow.Launcher/Themes/BlackAndWhite.xaml b/Flow.Launcher/Themes/BlackAndWhite.xaml index 395f5d614..5c7b03d26 100644 --- a/Flow.Launcher/Themes/BlackAndWhite.xaml +++ b/Flow.Launcher/Themes/BlackAndWhite.xaml @@ -1,44 +1,80 @@ - + - - - - - - - - - #494949 - @@ -50,4 +86,16 @@ + + \ No newline at end of file diff --git a/Flow.Launcher/Themes/BlurBlack Darker.xaml b/Flow.Launcher/Themes/BlurBlack Darker.xaml index 6dc0db45e..9e8a6f095 100644 --- a/Flow.Launcher/Themes/BlurBlack Darker.xaml +++ b/Flow.Launcher/Themes/BlurBlack Darker.xaml @@ -156,4 +156,17 @@ + + diff --git a/Flow.Launcher/Themes/BlurBlack.xaml b/Flow.Launcher/Themes/BlurBlack.xaml index 5a0023d4a..60237fdac 100644 --- a/Flow.Launcher/Themes/BlurBlack.xaml +++ b/Flow.Launcher/Themes/BlurBlack.xaml @@ -137,4 +137,16 @@ + + \ No newline at end of file diff --git a/Flow.Launcher/Themes/BlurWhite.xaml b/Flow.Launcher/Themes/BlurWhite.xaml index 6308f9e47..f05327990 100644 --- a/Flow.Launcher/Themes/BlurWhite.xaml +++ b/Flow.Launcher/Themes/BlurWhite.xaml @@ -157,4 +157,16 @@ + + diff --git a/Flow.Launcher/Themes/Darker Glass.xaml b/Flow.Launcher/Themes/Darker Glass.xaml index 41f2d16bf..80a9c353b 100644 --- a/Flow.Launcher/Themes/Darker Glass.xaml +++ b/Flow.Launcher/Themes/Darker Glass.xaml @@ -150,7 +150,24 @@ TargetType="{x:Type TextBlock}"> - + + + + diff --git a/Flow.Launcher/Themes/Darker.xaml b/Flow.Launcher/Themes/Darker.xaml index b255c4d9e..3c4438384 100644 --- a/Flow.Launcher/Themes/Darker.xaml +++ b/Flow.Launcher/Themes/Darker.xaml @@ -94,4 +94,16 @@ TargetType="{x:Type TextBlock}"> + + diff --git a/Flow.Launcher/Themes/Discord Dark.xaml b/Flow.Launcher/Themes/Discord Dark.xaml index b8872385e..df0f143cb 100644 --- a/Flow.Launcher/Themes/Discord Dark.xaml +++ b/Flow.Launcher/Themes/Discord Dark.xaml @@ -165,7 +165,22 @@ TargetType="{x:Type TextBlock}"> - + + + diff --git a/Flow.Launcher/Themes/Dracula.xaml b/Flow.Launcher/Themes/Dracula.xaml index 0dd97b9fe..93cad211e 100644 --- a/Flow.Launcher/Themes/Dracula.xaml +++ b/Flow.Launcher/Themes/Dracula.xaml @@ -167,8 +167,22 @@ TargetType="{x:Type TextBlock}"> - - + + + diff --git a/Flow.Launcher/Themes/Gray.xaml b/Flow.Launcher/Themes/Gray.xaml index 1cacc8ec2..487c9a839 100644 --- a/Flow.Launcher/Themes/Gray.xaml +++ b/Flow.Launcher/Themes/Gray.xaml @@ -126,4 +126,16 @@ TargetType="{x:Type TextBlock}"> + + diff --git a/Flow.Launcher/Themes/League.xaml b/Flow.Launcher/Themes/League.xaml index d926f0519..70f63cb76 100644 --- a/Flow.Launcher/Themes/League.xaml +++ b/Flow.Launcher/Themes/League.xaml @@ -130,9 +130,24 @@ TargetType="{x:Type TextBlock}"> - + + \ No newline at end of file diff --git a/Flow.Launcher/Themes/Light.xaml b/Flow.Launcher/Themes/Light.xaml index dae40e9eb..97dd09a79 100644 --- a/Flow.Launcher/Themes/Light.xaml +++ b/Flow.Launcher/Themes/Light.xaml @@ -1,63 +1,103 @@ - + - + - - - - - - + - - - + + #d9d9d9 - - - - - + + + \ No newline at end of file diff --git a/Flow.Launcher/Themes/Metro Server.xaml b/Flow.Launcher/Themes/Metro Server.xaml index 1b6795b59..d6b3ed52b 100644 --- a/Flow.Launcher/Themes/Metro Server.xaml +++ b/Flow.Launcher/Themes/Metro Server.xaml @@ -110,7 +110,22 @@ - + + \ No newline at end of file diff --git a/Flow.Launcher/Themes/Nord Darker.xaml b/Flow.Launcher/Themes/Nord Darker.xaml index 3946b91ff..9f32a3add 100644 --- a/Flow.Launcher/Themes/Nord Darker.xaml +++ b/Flow.Launcher/Themes/Nord Darker.xaml @@ -131,5 +131,17 @@ + + + diff --git a/Flow.Launcher/Themes/Nord.xaml b/Flow.Launcher/Themes/Nord.xaml index dafb83c39..8c9a092cc 100644 --- a/Flow.Launcher/Themes/Nord.xaml +++ b/Flow.Launcher/Themes/Nord.xaml @@ -128,7 +128,22 @@ TargetType="{x:Type TextBlock}"> - + + diff --git a/Flow.Launcher/Themes/Pink.xaml b/Flow.Launcher/Themes/Pink.xaml index 7e1ae911a..f3fd4cdac 100644 --- a/Flow.Launcher/Themes/Pink.xaml +++ b/Flow.Launcher/Themes/Pink.xaml @@ -125,4 +125,17 @@ TargetType="{x:Type TextBlock}"> + + \ No newline at end of file diff --git a/Flow.Launcher/Themes/Sublime.xaml b/Flow.Launcher/Themes/Sublime.xaml index 4cc2248f3..0373467cd 100644 --- a/Flow.Launcher/Themes/Sublime.xaml +++ b/Flow.Launcher/Themes/Sublime.xaml @@ -164,7 +164,22 @@ TargetType="{x:Type TextBlock}"> - + + diff --git a/Flow.Launcher/Themes/Win10Light.xaml b/Flow.Launcher/Themes/Win10Light.xaml index 7d3ae2cac..af3c45260 100644 --- a/Flow.Launcher/Themes/Win10Light.xaml +++ b/Flow.Launcher/Themes/Win10Light.xaml @@ -167,7 +167,22 @@ TargetType="{x:Type TextBlock}"> - + + diff --git a/Flow.Launcher/Themes/Win11Dark.xaml b/Flow.Launcher/Themes/Win11Dark.xaml index 1558bd1f4..edf765a2d 100644 --- a/Flow.Launcher/Themes/Win11Dark.xaml +++ b/Flow.Launcher/Themes/Win11Dark.xaml @@ -168,7 +168,22 @@ TargetType="{x:Type TextBlock}"> - + + diff --git a/Flow.Launcher/Themes/Win11Light.xaml b/Flow.Launcher/Themes/Win11Light.xaml index 731246565..d55974570 100644 --- a/Flow.Launcher/Themes/Win11Light.xaml +++ b/Flow.Launcher/Themes/Win11Light.xaml @@ -179,4 +179,16 @@ + + diff --git a/Flow.Launcher/Themes/Win11System.xaml b/Flow.Launcher/Themes/Win11System.xaml index d136d24a8..1d1a4d437 100644 --- a/Flow.Launcher/Themes/Win11System.xaml +++ b/Flow.Launcher/Themes/Win11System.xaml @@ -168,7 +168,24 @@ TargetType="{x:Type TextBlock}"> - + +