prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2735 from onesounds/240518Adjusthemes

Browse source 
Adjust Themes
This commit is contained in:
Kevin Zhang 2024-06-07 15:40:45 -07:00 committed by GitHub
commit bd14aa42cc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
32 changed files with 597 additions and 1268 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
Flow.Launcher.Core/Resource/Theme.cs
View file

@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Xml;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
@ -17,6 +18,10 @@ namespace Flow.Launcher.Core.Resource
{ {
public class Theme public class Theme
{ {
private const string ThemeMetadataNamePrefix = "Name:";
private const string ThemeMetadataIsDarkPrefix = "IsDark:";
private const string ThemeMetadataHasBlurPrefix = "HasBlur:";
private const int ShadowExtraMargin = 32; private const int ShadowExtraMargin = 32;
private readonly List<string> _themeDirectories = new List<string>(); private readonly List<string> _themeDirectories = new List<string>();
@ -79,14 +84,14 @@ namespace Flow.Launcher.Core.Resource
{ {
if (string.IsNullOrEmpty(path)) if (string.IsNullOrEmpty(path))
throw new DirectoryNotFoundException("Theme path can't be found <{path}>"); throw new DirectoryNotFoundException("Theme path can't be found <{path}>");
// reload all resources even if the theme itself hasn't changed in order to pickup changes // reload all resources even if the theme itself hasn't changed in order to pickup changes
// to things like fonts // to things like fonts
UpdateResourceDictionary(GetResourceDictionary(theme)); UpdateResourceDictionary(GetResourceDictionary(theme));
Settings.Theme = theme; Settings.Theme = theme;
//always allow re-loading default theme, in case of failure of switching to a new theme from default theme //always allow re-loading default theme, in case of failure of switching to a new theme from default theme
if (_oldTheme != theme || theme == defaultTheme) if (_oldTheme != theme || theme == defaultTheme)
{ {
@ -148,7 +153,7 @@ namespace Flow.Launcher.Core.Resource
public ResourceDictionary GetResourceDictionary(string theme) public ResourceDictionary GetResourceDictionary(string theme)
{ {
var dict = GetThemeResourceDictionary(theme); var dict = GetThemeResourceDictionary(theme);
if (dict["QueryBoxStyle"] is Style queryBoxStyle && if (dict["QueryBoxStyle"] is Style queryBoxStyle &&
dict["QuerySuggestionBoxStyle"] is Style querySuggestionBoxStyle) dict["QuerySuggestionBoxStyle"] is Style querySuggestionBoxStyle)
{ {
@ -187,7 +192,7 @@ namespace Flow.Launcher.Core.Resource
Setter[] setters = { fontFamily, fontStyle, fontWeight, fontStretch }; Setter[] setters = { fontFamily, fontStyle, fontWeight, fontStretch };
Array.ForEach( Array.ForEach(
new[] { resultItemStyle, resultItemSelectedStyle, resultHotkeyItemStyle, resultHotkeyItemSelectedStyle }, o new[] { resultItemStyle, resultItemSelectedStyle, resultHotkeyItemStyle, resultHotkeyItemSelectedStyle }, o
=> Array.ForEach(setters, p => o.Setters.Add(p))); => Array.ForEach(setters, p => o.Setters.Add(p)));
} }
@ -219,17 +224,53 @@ namespace Flow.Launcher.Core.Resource
return GetResourceDictionary(Settings.Theme); return GetResourceDictionary(Settings.Theme);
} }
public List<string> LoadAvailableThemes() public List<ThemeData> LoadAvailableThemes()
{ {
List<string> themes = new List<string>(); List<ThemeData> themes = new List<ThemeData>();
foreach (var themeDirectory in _themeDirectories) foreach (var themeDirectory in _themeDirectories)
{ {
themes.AddRange( var filePaths = Directory
Directory.GetFiles(themeDirectory) .GetFiles(themeDirectory)
.Where(filePath => filePath.EndsWith(Extension) && !filePath.EndsWith("Base.xaml")) .Where(filePath => filePath.EndsWith(Extension) && !filePath.EndsWith("Base.xaml"))
.ToList()); .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 name = extensionlessName;
bool? isDark = null;
bool? hasBlur = null;
foreach (var line in commentLines)
{
if (line.StartsWith(ThemeMetadataNamePrefix, StringComparison.OrdinalIgnoreCase))
{
name = line.Remove(0, ThemeMetadataNamePrefix.Length).Trim();
}
else if (line.StartsWith(ThemeMetadataIsDarkPrefix, StringComparison.OrdinalIgnoreCase))
{
isDark = bool.Parse(line.Remove(0, ThemeMetadataIsDarkPrefix.Length).Trim());
}
else if (line.StartsWith(ThemeMetadataHasBlurPrefix, StringComparison.OrdinalIgnoreCase))
{
hasBlur = bool.Parse(line.Remove(0, ThemeMetadataHasBlurPrefix.Length).Trim());
}
}
return new ThemeData(extensionlessName, name, isDark, hasBlur);
} }
private string GetThemePath(string themeName) private string GetThemePath(string themeName)
@ -407,5 +448,7 @@ namespace Flow.Launcher.Core.Resource
Marshal.FreeHGlobal(accentPtr); Marshal.FreeHGlobal(accentPtr);
} }
#endregion #endregion
public record ThemeData(string FileNameWithoutExtension, string Name, bool? IsDark = null, bool? HasBlur = null);
} }
} }

2
Flow.Launcher.Infrastructure/UserSettings/Settings.cs
View file

@ -55,7 +55,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings
OnPropertyChanged(nameof(MaxResultsToShow)); 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.*/ /* Appearance Settings. It should be separated from the setting later.*/
public double WindowHeightSize { get; set; } = 42; public double WindowHeightSize { get; set; } = 42;

2
Flow.Launcher/App.xaml
View file

@ -25,7 +25,7 @@
<ui:XamlControlsResources /> <ui:XamlControlsResources />
<ResourceDictionary Source="pack://application:,,,/Resources/CustomControlTemplate.xaml" /> <ResourceDictionary Source="pack://application:,,,/Resources/CustomControlTemplate.xaml" />
<ResourceDictionary Source="pack://application:,,,/Resources/SettingWindowStyle.xaml" /> <ResourceDictionary Source="pack://application:,,,/Resources/SettingWindowStyle.xaml" />
<ResourceDictionary Source="pack://application:,,,/Themes/Win11System.xaml" /> <ResourceDictionary Source="pack://application:,,,/Themes/Win11Light.xaml" />
<ResourceDictionary Source="pack://application:,,,/Languages/en.xaml" /> <ResourceDictionary Source="pack://application:,,,/Languages/en.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>

247
Flow.Launcher/MainWindow.xaml
View file

@ -380,24 +380,24 @@
</ContentControl> </ContentControl>
</Grid> </Grid>
<Grid> <Border Style="{DynamicResource WindowRadius}">
<Grid.ColumnDefinitions> <Border.Clip>
<ColumnDefinition Width="*" MinWidth="80" /> <MultiBinding Converter="{StaticResource BorderClipConverter}">
<ColumnDefinition Width="Auto" /> <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
<ColumnDefinition Width="0.85*" MinWidth="244" /> <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
</Grid.ColumnDefinitions> <Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
<StackPanel </MultiBinding>
x:Name="ResultArea" </Border.Clip>
Grid.Column="0" <Grid>
Grid.ColumnSpan="{Binding ResultAreaColumn}"> <Grid.ColumnDefinitions>
<Border Style="{DynamicResource WindowRadius}"> <ColumnDefinition Width="*" MinWidth="80" />
<Border.Clip> <ColumnDefinition Width="Auto" />
<MultiBinding Converter="{StaticResource BorderClipConverter}"> <ColumnDefinition Width="0.85*" MinWidth="244" />
<Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" /> </Grid.ColumnDefinitions>
<Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" /> <StackPanel
<Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" /> x:Name="ResultArea"
</MultiBinding> Grid.Column="0"
</Border.Clip> Grid.ColumnSpan="{Binding ResultAreaColumn}">
<ContentControl> <ContentControl>
<flowlauncher:ResultListBox <flowlauncher:ResultListBox
x:Name="ResultListBox" x:Name="ResultListBox"
@ -405,15 +405,6 @@
LeftClickResultCommand="{Binding LeftClickResultCommand}" LeftClickResultCommand="{Binding LeftClickResultCommand}"
RightClickResultCommand="{Binding RightClickResultCommand}" /> RightClickResultCommand="{Binding RightClickResultCommand}" />
</ContentControl> </ContentControl>
</Border>
<Border Style="{DynamicResource WindowRadius}">
<Border.Clip>
<MultiBinding Converter="{StaticResource BorderClipConverter}">
<Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
<Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
<Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
</MultiBinding>
</Border.Clip>
<ContentControl> <ContentControl>
<flowlauncher:ResultListBox <flowlauncher:ResultListBox
x:Name="ContextMenu" x:Name="ContextMenu"
@ -421,15 +412,6 @@
LeftClickResultCommand="{Binding LeftClickResultCommand}" LeftClickResultCommand="{Binding LeftClickResultCommand}"
RightClickResultCommand="{Binding RightClickResultCommand}" /> RightClickResultCommand="{Binding RightClickResultCommand}" />
</ContentControl> </ContentControl>
</Border>
<Border Style="{DynamicResource WindowRadius}">
<Border.Clip>
<MultiBinding Converter="{StaticResource BorderClipConverter}">
<Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
<Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
<Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
</MultiBinding>
</Border.Clip>
<ContentControl> <ContentControl>
<flowlauncher:ResultListBox <flowlauncher:ResultListBox
x:Name="History" x:Name="History"
@ -437,109 +419,114 @@
LeftClickResultCommand="{Binding LeftClickResultCommand}" LeftClickResultCommand="{Binding LeftClickResultCommand}"
RightClickResultCommand="{Binding RightClickResultCommand}" /> RightClickResultCommand="{Binding RightClickResultCommand}" />
</ContentControl> </ContentControl>
</Border> </StackPanel>
</StackPanel> <GridSplitter
<GridSplitter Grid.Column="1"
Grid.Column="1" Margin="0"
Width="{Binding PreviewVisible, Converter={StaticResource SplitterConverter}}" HorizontalAlignment="Center"
Margin="0" VerticalAlignment="Stretch"
HorizontalAlignment="Center" Background="Transparent"
VerticalAlignment="Stretch" ShowsPreview="True"
Background="Transparent" Visibility="{Binding PreviewVisible, Converter={StaticResource BoolToVisibilityConverter}}">
ShowsPreview="True" /> <GridSplitter.Template>
<Grid <ControlTemplate TargetType="{x:Type GridSplitter}">
x:Name="Preview" <Border Style="{DynamicResource PreviewBorderStyle}" />
Grid.Column="2" </ControlTemplate>
VerticalAlignment="Stretch" </GridSplitter.Template>
Style="{DynamicResource PreviewArea}" </GridSplitter>
Visibility="{Binding PreviewVisible, Converter={StaticResource BoolToVisibilityConverter}}"> <Grid
<Border x:Name="Preview"
MinHeight="380" Grid.Column="2"
d:DataContext="{d:DesignInstance vm:ResultViewModel}" VerticalAlignment="Stretch"
DataContext="{Binding SelectedItem, ElementName=ResultListBox}" Style="{DynamicResource PreviewArea}"
Style="{DynamicResource PreviewBorderStyle}" Visibility="{Binding PreviewVisible, Converter={StaticResource BoolToVisibilityConverter}}">
Visibility="{Binding ShowDefaultPreview}"> <Border
<Grid MinHeight="380"
Margin="20 0 10 0" d:DataContext="{d:DesignInstance vm:ResultViewModel}"
VerticalAlignment="Stretch" DataContext="{Binding SelectedItem, ElementName=ResultListBox}"
Background="Transparent"> Visibility="{Binding ShowDefaultPreview}">
<Grid.RowDefinitions> <Grid
<RowDefinition Height="*" /> Margin="0 0 10 5"
<RowDefinition Height="Auto" /> VerticalAlignment="Stretch"
</Grid.RowDefinitions> Background="Transparent">
<Grid Grid.Row="0" VerticalAlignment="Center">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="*" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock <Grid Grid.Row="0" VerticalAlignment="Center">
x:Name="PreviewGlyphIcon" <Grid.RowDefinitions>
Grid.Row="0" <RowDefinition Height="Auto" />
Height="Auto" <RowDefinition Height="Auto" />
Margin="0 16 0 0" </Grid.RowDefinitions>
FontFamily="{Binding Glyph.FontFamily}" <TextBlock
Style="{DynamicResource PreviewGlyph}" x:Name="PreviewGlyphIcon"
Text="{Binding Glyph.Glyph}" Grid.Row="0"
Visibility="{Binding ShowGlyph}" /> Height="Auto"
<Image Margin="0 16 0 0"
x:Name="PreviewImageIcon" FontFamily="{Binding Glyph.FontFamily}"
Grid.Row="0" Style="{DynamicResource PreviewGlyph}"
MaxHeight="320" Text="{Binding Glyph.Glyph}"
Margin="0 16 0 0" Visibility="{Binding ShowGlyph}" />
HorizontalAlignment="Center" <Image
Source="{Binding PreviewImage}" x:Name="PreviewImageIcon"
StretchDirection="DownOnly" Grid.Row="0"
Visibility="{Binding ShowPreviewImage}"> MaxHeight="320"
<Image.Style> Margin="0 16 0 0"
<Style TargetType="{x:Type Image}"> HorizontalAlignment="Center"
<Setter Property="MaxWidth" Value="96" /> Source="{Binding PreviewImage}"
StretchDirection="DownOnly"
Visibility="{Binding ShowPreviewImage}">
<Image.Style>
<Style TargetType="{x:Type Image}">
<Setter Property="MaxWidth" Value="96" />
<Style.Triggers>
<DataTrigger Binding="{Binding UseBigThumbnail}" Value="True">
<Setter Property="MaxWidth" Value="{Binding ElementName=Preview, Path=ActualWidth}" />
</DataTrigger>
</Style.Triggers>
</Style>
</Image.Style>
</Image>
<TextBlock
x:Name="PreviewTitle"
Grid.Row="1"
Margin="0 6 0 16"
HorizontalAlignment="Stretch"
Style="{DynamicResource PreviewItemTitleStyle}"
Text="{Binding Result.Title}"
TextAlignment="Center"
TextWrapping="Wrap" />
</Grid>
<StackPanel Grid.Row="1">
<StackPanel.Style>
<Style TargetType="{x:Type StackPanel}">
<Style.Triggers> <Style.Triggers>
<DataTrigger Binding="{Binding UseBigThumbnail}" Value="True"> <DataTrigger Binding="{Binding ElementName=PreviewSubTitle, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0">
<Setter Property="MaxWidth" Value="{Binding ElementName=Preview, Path=ActualWidth}" /> <Setter Property="Visibility" Value="Collapsed" />
</DataTrigger> </DataTrigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
</Image.Style> </StackPanel.Style>
</Image> <Separator Style="{DynamicResource PreviewSep}" />
<TextBlock <TextBlock
x:Name="PreviewTitle" x:Name="PreviewSubTitle"
Grid.Row="1" Style="{DynamicResource PreviewItemSubTitleStyle}"
Margin="0 6 0 16" Text="{Binding Result.SubTitle}" />
HorizontalAlignment="Stretch" </StackPanel>
Style="{DynamicResource PreviewItemTitleStyle}"
Text="{Binding Result.Title}"
TextAlignment="Center"
TextWrapping="Wrap" />
</Grid> </Grid>
<StackPanel Grid.Row="1"> </Border>
<StackPanel.Style> <Border
<Style TargetType="{x:Type StackPanel}"> MinHeight="380"
<Style.Triggers> MaxHeight="{Binding ElementName=ResultListBox, Path=ActualHeight}"
<DataTrigger Binding="{Binding ElementName=PreviewSubTitle, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0"> Padding="0 0 10 10"
<Setter Property="Visibility" Value="Collapsed" /> d:DataContext="{d:DesignInstance vm:ResultViewModel}"
</DataTrigger> DataContext="{Binding SelectedItem, ElementName=ResultListBox}"
</Style.Triggers> Visibility="{Binding ShowCustomizedPreview}">
</Style> <ContentControl Content="{Binding Result.PreviewPanel.Value}" />
</StackPanel.Style> </Border>
<Separator Style="{DynamicResource PreviewSep}" /> </Grid>
<TextBlock
x:Name="PreviewSubTitle"
Style="{DynamicResource PreviewItemSubTitleStyle}"
Text="{Binding Result.SubTitle}" />
</StackPanel>
</Grid>
</Border>
<Border
MinHeight="380"
MaxHeight="{Binding ElementName=ResultListBox, Path=ActualHeight}"
d:DataContext="{d:DesignInstance vm:ResultViewModel}"
DataContext="{Binding SelectedItem, ElementName=ResultListBox}"
Style="{DynamicResource PreviewBorderStyle}"
Visibility="{Binding ShowCustomizedPreview}">
<ContentControl Content="{Binding Result.PreviewPanel.Value}" />
</Border>
</Grid> </Grid>
</Grid> </Border>
</StackPanel> </StackPanel>
</Border> </Border>
</Window> </Window>

5
Flow.Launcher/Resources/Dark.xaml
View file

@ -7,16 +7,17 @@
xmlns:sys="clr-namespace:System;assembly=mscorlib"> xmlns:sys="clr-namespace:System;assembly=mscorlib">
<SolidColorBrush x:Key="SystemThemeBorder" Color="#3f3f3f" /> <SolidColorBrush x:Key="SystemThemeBorder" Color="#3f3f3f" />
<SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#7b7b7b" /> <SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#4d4d4d" />
<SolidColorBrush x:Key="QuerySelectionBrush" Color="#4a5459" /> <SolidColorBrush x:Key="QuerySelectionBrush" Color="#4a5459" />
<SolidColorBrush x:Key="SubTitleForeground" Color="#7b7b7b" /> <SolidColorBrush x:Key="SubTitleForeground" Color="#7b7b7b" />
<SolidColorBrush x:Key="SubTitleSelectedForeground" Color="#7b7b7b" /> <SolidColorBrush x:Key="SubTitleSelectedForeground" Color="#7b7b7b" />
<SolidColorBrush x:Key="SearchIconForeground" Color="#4d4d4d" /> <SolidColorBrush x:Key="SearchIconForeground" Color="#4d4d4d" />
<SolidColorBrush x:Key="SeparatorForeground" Color="#4d4d4d" /> <SolidColorBrush x:Key="SeparatorForeground" Color="#14ffffff" />
<SolidColorBrush x:Key="ThumbColor" Color="#9a9a9a" /> <SolidColorBrush x:Key="ThumbColor" Color="#9a9a9a" />
<SolidColorBrush x:Key="InlineHighlight" Color="#0078d7" /> <SolidColorBrush x:Key="InlineHighlight" Color="#0078d7" />
<SolidColorBrush x:Key="HotkeyForeground" Color="#7b7b7b" /> <SolidColorBrush x:Key="HotkeyForeground" Color="#7b7b7b" />
<SolidColorBrush x:Key="HotkeySelectedForeground" Color="#7b7b7b" /> <SolidColorBrush x:Key="HotkeySelectedForeground" Color="#7b7b7b" />
<SolidColorBrush x:Key="ClockDateForeground" Color="#4d4d4d" />
<Color x:Key="ItemSelectedBackgroundColorBrush">#198F8F8F</Color> <Color x:Key="ItemSelectedBackgroundColorBrush">#198F8F8F</Color>

5
Flow.Launcher/Resources/Light.xaml
View file

@ -7,16 +7,17 @@
xmlns:sys="clr-namespace:System;assembly=mscorlib"> xmlns:sys="clr-namespace:System;assembly=mscorlib">
<SolidColorBrush x:Key="SystemThemeBorder" Color="#aaaaaa" /> <SolidColorBrush x:Key="SystemThemeBorder" Color="#aaaaaa" />
<SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#b5b5b5" /> <SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#d8d2d0" />
<SolidColorBrush x:Key="QuerySelectionBrush" Color="#0a68d8" /> <SolidColorBrush x:Key="QuerySelectionBrush" Color="#0a68d8" />
<SolidColorBrush x:Key="SubTitleForeground" Color="#818181" /> <SolidColorBrush x:Key="SubTitleForeground" Color="#818181" />
<SolidColorBrush x:Key="SubTitleSelectedForeground" Color="#72767d" /> <SolidColorBrush x:Key="SubTitleSelectedForeground" Color="#72767d" />
<SolidColorBrush x:Key="SearchIconForeground" Color="#d3d3d3" /> <SolidColorBrush x:Key="SearchIconForeground" Color="#d3d3d3" />
<SolidColorBrush x:Key="SeparatorForeground" Color="#eaeaea" /> <SolidColorBrush x:Key="SeparatorForeground" Color="#14000000" />
<SolidColorBrush x:Key="ThumbColor" Color="#868686" /> <SolidColorBrush x:Key="ThumbColor" Color="#868686" />
<SolidColorBrush x:Key="InlineHighlight" Color="#0078d7" /> <SolidColorBrush x:Key="InlineHighlight" Color="#0078d7" />
<SolidColorBrush x:Key="HotkeyForeground" Color="#acacac" /> <SolidColorBrush x:Key="HotkeyForeground" Color="#acacac" />
<SolidColorBrush x:Key="HotkeySelectedForeground" Color="#acacac" /> <SolidColorBrush x:Key="HotkeySelectedForeground" Color="#acacac" />
<SolidColorBrush x:Key="ClockDateForeground" Color="#d3d3d3" />
<Color x:Key="ItemSelectedBackgroundColorBrush">#198F8F8F</Color> <Color x:Key="ItemSelectedBackgroundColorBrush">#198F8F8F</Color>
<SolidColorBrush x:Key="Color00B" Color="#fbfbfb" /> <SolidColorBrush x:Key="Color00B" Color="#fbfbfb" />

95
Flow.Launcher/Resources/SettingWindowStyle.xaml
View file

@ -25,7 +25,7 @@
<Setter.Value> <Setter.Value>
<ControlTemplate> <ControlTemplate>
<Rectangle <Rectangle
Margin="-8,-4,-8,-4" Margin="-8 -4 -8 -4"
RadiusX="5" RadiusX="5"
RadiusY="5" RadiusY="5"
Stroke="{DynamicResource Color05B}" Stroke="{DynamicResource Color05B}"
@ -54,31 +54,72 @@
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
<Style x:Key="ThemeList" TargetType="ListBoxItem">
<Setter Property="HorizontalContentAlignment" Value="Left" />
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="Padding" Value="0" />
<Setter Property="Margin" Value="4" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ListBoxItem}">
<Border
x:Name="Bd"
Padding="{TemplateBinding Padding}"
Background="{DynamicResource Color12B}"
BorderBrush="{DynamicResource Color03B}"
BorderThickness="1 1 1 0"
CornerRadius="4"
SnapsToDevicePixels="true">
<Border
x:Name="Bd2"
BorderBrush="{DynamicResource Color14B}"
BorderThickness="0 0 0 2"
CornerRadius="4">
<ContentPresenter
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</Border>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="true">
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource ThemeHoverButton}" />
</Trigger>
<Trigger Property="IsSelected" Value="true">
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource ToggleSwitchFillOn}" />
<Setter TargetName="Bd2" Property="BorderThickness" Value="0" />
<Setter TargetName="Bd2" Property="TextElement.Foreground" Value="{DynamicResource Color02B}" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="SettingGroupBox" TargetType="{x:Type Border}"> <Style x:Key="SettingGroupBox" TargetType="{x:Type Border}">
<Setter Property="Background" Value="{DynamicResource Color00B}" /> <Setter Property="Background" Value="{DynamicResource Color00B}" />
<Setter Property="BorderBrush" Value="{DynamicResource Color03B}" /> <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
<Setter Property="BorderThickness" Value="1" /> <Setter Property="BorderThickness" Value="1" />
<Setter Property="CornerRadius" Value="5" /> <Setter Property="CornerRadius" Value="5" />
<Setter Property="Margin" Value="0,5,0,0" /> <Setter Property="Margin" Value="0 5 0 0" />
<Setter Property="Padding" Value="0,15,0,15" /> <Setter Property="Padding" Value="0 15 0 15" />
<Setter Property="SnapsToDevicePixels" Value="True" /> <Setter Property="SnapsToDevicePixels" Value="True" />
</Style> </Style>
<Style x:Key="SettingTitleLabel" TargetType="{x:Type TextBlock}"> <Style x:Key="SettingTitleLabel" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="{DynamicResource Color05B}" /> <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
<Setter Property="Margin" Value="0,0,0,0" /> <Setter Property="Margin" Value="0 0 0 0" />
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="TextWrapping" Value="Wrap" />
</Style> </Style>
<Style x:Key="SettingSubTitleLabel" TargetType="{x:Type TextBlock}"> <Style x:Key="SettingSubTitleLabel" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="{DynamicResource Color04B}" /> <Setter Property="Foreground" Value="{DynamicResource Color04B}" />
<Setter Property="FontSize" Value="12" /> <Setter Property="FontSize" Value="12" />
<Setter Property="Margin" Value="0,0,0,0" /> <Setter Property="Margin" Value="0 0 0 0" />
<Setter Property="Padding" Value="0,0,24,0" /> <Setter Property="Padding" Value="0 0 24 0" />
<Setter Property="TextWrapping" Value="WrapWithOverflow" /> <Setter Property="TextWrapping" Value="WrapWithOverflow" />
</Style> </Style>
<Style x:Key="TextPanel" TargetType="{x:Type StackPanel}"> <Style x:Key="TextPanel" TargetType="{x:Type StackPanel}">
<Setter Property="Grid.Column" Value="1" /> <Setter Property="Grid.Column" Value="1" />
<Setter Property="Margin" Value="0,0,0,0" /> <Setter Property="Margin" Value="0 0 0 0" />
<Setter Property="Width" Value="Auto" /> <Setter Property="Width" Value="Auto" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
@ -89,7 +130,7 @@
TargetType="{x:Type CheckBox}"> TargetType="{x:Type CheckBox}">
<Setter Property="Width" Value="24" /> <Setter Property="Width" Value="24" />
<Setter Property="Grid.Column" Value="2" /> <Setter Property="Grid.Column" Value="2" />
<Setter Property="Margin" Value="0,4,10,4" /> <Setter Property="Margin" Value="0 4 10 4" />
<Setter Property="LayoutTransform"> <Setter Property="LayoutTransform">
<Setter.Value> <Setter.Value>
<ScaleTransform ScaleX="1" ScaleY="1" /> <ScaleTransform ScaleX="1" ScaleY="1" />
@ -100,7 +141,7 @@
<Style x:Key="SideTextAbout" TargetType="{x:Type TextBlock}"> <Style x:Key="SideTextAbout" TargetType="{x:Type TextBlock}">
<Setter Property="HorizontalAlignment" Value="Right" /> <Setter Property="HorizontalAlignment" Value="Right" />
<Setter Property="Grid.Column" Value="1" /> <Setter Property="Grid.Column" Value="1" />
<Setter Property="Margin" Value="0,0,-18,0" /> <Setter Property="Margin" Value="0 0 -18 0" />
</Style> </Style>
@ -123,8 +164,8 @@
x:Name="Spacer" x:Name="Spacer"
Width="Auto" Width="Auto"
Height="Auto" Height="Auto"
Margin="0,10,5,0" Margin="0 10 5 0"
Padding="0,0,0,0" Padding="0 0 0 0"
BorderBrush="Transparent" BorderBrush="Transparent"
BorderThickness="0"> BorderThickness="0">
<Border <Border
@ -133,7 +174,7 @@
CornerRadius="5"> CornerRadius="5">
<ContentPresenter <ContentPresenter
x:Name="ContentSite" x:Name="ContentSite"
Margin="12,12,0,12" Margin="12 12 0 12"
HorizontalAlignment="LEFT" HorizontalAlignment="LEFT"
VerticalAlignment="Center" VerticalAlignment="Center"
ContentSource="Header" ContentSource="Header"
@ -165,8 +206,8 @@
<Border <Border
x:Name="border" x:Name="border"
Height="40" Height="40"
Margin="14,4,8,4" Margin="14 4 8 4"
Padding="0,0,0,0" Padding="0 0 0 0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Background="{DynamicResource Color01B}" Background="{DynamicResource Color01B}"
CornerRadius="5"> CornerRadius="5">
@ -180,7 +221,7 @@
Grid.Column="0" Grid.Column="0"
Width="4" Width="4"
Height="18" Height="18"
Margin="0,11,0,11" Margin="0 11 0 11"
Fill="{DynamicResource ToggleSwitchFillOn}" Fill="{DynamicResource ToggleSwitchFillOn}"
RadiusX="2" RadiusX="2"
RadiusY="2" RadiusY="2"
@ -188,7 +229,7 @@
<ContentPresenter <ContentPresenter
x:Name="ContentSite" x:Name="ContentSite"
Grid.Column="1" Grid.Column="1"
Margin="12,11,18,11" Margin="12 11 18 11"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
ContentSource="Header" ContentSource="Header"
@ -212,10 +253,10 @@
<Style x:Key="PluginList" TargetType="ListBoxItem"> <Style x:Key="PluginList" TargetType="ListBoxItem">
<Setter Property="Background" Value="{DynamicResource Color00B}" /> <Setter Property="Background" Value="{DynamicResource Color00B}" />
<Setter Property="Padding" Value="0,0,0,0" /> <Setter Property="Padding" Value="0 0 0 0" />
<Setter Property="UseLayoutRounding" Value="True" /> <Setter Property="UseLayoutRounding" Value="True" />
<Setter Property="SnapsToDevicePixels" Value="True" /> <Setter Property="SnapsToDevicePixels" Value="True" />
<Setter Property="Margin" Value="0,0,18,5" /> <Setter Property="Margin" Value="0 0 18 5" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" /> <Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="BorderBrush" Value="{DynamicResource Color03B}" /> <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
<!--#region Template for blue highlight win10--> <!--#region Template for blue highlight win10-->
@ -255,7 +296,7 @@
</MultiTrigger.Conditions> </MultiTrigger.Conditions>
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource Color00B}" /> <Setter TargetName="Bd" Property="Background" Value="{DynamicResource Color00B}" />
<Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource Color03B}" /> <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource Color03B}" />
<Setter TargetName="Bd" Property="Margin" Value="0,0,0,0" /> <Setter TargetName="Bd" Property="Margin" Value="0 0 0 0" />
</MultiTrigger> </MultiTrigger>
@ -267,7 +308,7 @@
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource Color00B}" /> <Setter TargetName="Bd" Property="Background" Value="{DynamicResource Color00B}" />
<Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource Color03B}" /> <Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource Color03B}" />
<Setter TargetName="Bd" Property="CornerRadius" Value="5" /> <Setter TargetName="Bd" Property="CornerRadius" Value="5" />
<Setter TargetName="Bd" Property="Margin" Value="0,0,0,0" /> <Setter TargetName="Bd" Property="Margin" Value="0 0 0 0" />
</MultiTrigger> </MultiTrigger>
@ -284,10 +325,10 @@
<!--#region PluginStore Style--> <!--#region PluginStore Style-->
<Style x:Key="StoreList" TargetType="ListViewItem"> <Style x:Key="StoreList" TargetType="ListViewItem">
<Setter Property="Padding" Value="0,0,0,0" /> <Setter Property="Padding" Value="0 0 0 0" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" /> <Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="HorizontalAlignment" Value="Stretch" /> <Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="Margin" Value="0,0,8,8" /> <Setter Property="Margin" Value="0 0 8 8" />
<Setter Property="VerticalContentAlignment" Value="Stretch" /> <Setter Property="VerticalContentAlignment" Value="Stretch" />
<!--#region Template for blue highlight win10--> <!--#region Template for blue highlight win10-->
<Setter Property="Template"> <Setter Property="Template">
@ -325,10 +366,10 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate> <ControlTemplate>
<Grid Margin="20,0,0,0"> <Grid Margin="20 0 0 0">
<StackPanel> <StackPanel>
<TextBlock <TextBlock
Margin="0,20,0,4" Margin="0 20 0 4"
FontWeight="Bold" FontWeight="Bold"
Text="{DynamicResource searchplugin_Noresult_Title}" /> Text="{DynamicResource searchplugin_Noresult_Title}" />
<TextBlock Text="{DynamicResource searchplugin_Noresult_Subtitle}" /> <TextBlock Text="{DynamicResource searchplugin_Noresult_Subtitle}" />
@ -351,10 +392,10 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate> <ControlTemplate>
<Grid Margin="20,0,0,0"> <Grid Margin="20 0 0 0">
<StackPanel> <StackPanel>
<TextBlock <TextBlock
Margin="0,20,0,4" Margin="0 20 0 4"
FontWeight="Bold" FontWeight="Bold"
Text="{DynamicResource searchplugin_Noresult_Title}" /> Text="{DynamicResource searchplugin_Noresult_Title}" />
<TextBlock Text="{DynamicResource searchplugin_Noresult}" /> <TextBlock Text="{DynamicResource searchplugin_Noresult}" />
@ -394,7 +435,7 @@
x:Name="headerPanel" x:Name="headerPanel"
Grid.Row="0" Grid.Row="0"
Grid.Column="0" Grid.Column="0"
Margin="2,2,2,0" Margin="2 2 2 0"
Panel.ZIndex="1" Panel.ZIndex="1"
Background="Transparent" Background="Transparent"
IsItemsHost="true" IsItemsHost="true"

13
Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
View file

@ -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 LinkHowToCreateTheme => @"https://flowlauncher.com/docs/#/how-to-create-a-theme";
public static string LinkThemeGallery => "https://github.com/Flow-Launcher/Flow.Launcher/discussions/1438"; 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 set
{ {
ThemeManager.Instance.ChangeTheme(value); _selectedTheme = value;
ThemeManager.Instance.ChangeTheme(value.FileNameWithoutExtension);
if (ThemeManager.Instance.BlurEnabled && Settings.UseDropShadowEffect) if (ThemeManager.Instance.BlurEnabled && Settings.UseDropShadowEffect)
DropShadowEffect = false; DropShadowEffect = false;
@ -91,8 +93,9 @@ public partial class SettingsPaneThemeViewModel : BaseModel
get => Settings.ResultSubItemFontSize; get => Settings.ResultSubItemFontSize;
set => Settings.ResultSubItemFontSize = value; set => Settings.ResultSubItemFontSize = value;
} }
public List<string> Themes =>
ThemeManager.Instance.LoadAvailableThemes().Select(Path.GetFileNameWithoutExtension).ToList(); private List<Theme.ThemeData> _themes;
public List<Theme.ThemeData> Themes => _themes ??= ThemeManager.Instance.LoadAvailableThemes();
public class ColorScheme public class ColorScheme

195
Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
View file

@ -39,7 +39,17 @@
TextAlignment="left" TextAlignment="left"
Visibility="Collapsed" /> Visibility="Collapsed" />
<!-- Theme Preview and Editor --> <!-- Theme Preview and Editor -->
<Grid Height="380"> <Grid>
<Grid.Style>
<Style x:Name="PreviewArea" TargetType="Grid">
<Setter Property="MaxHeight" Value="380" />
<Style.Triggers>
<DataTrigger Binding="{Binding ElementName=Editor, Path=IsChecked}" Value="True">
<Setter Property="MaxHeight" Value="550" />
</DataTrigger>
</Style.Triggers>
</Style>
</Grid.Style>
<Grid.Resources> <Grid.Resources>
<!-- Style for the second ColumnDefinition --> <!-- Style for the second ColumnDefinition -->
<Style x:Key="SecondColumnStyle" TargetType="ColumnDefinition"> <Style x:Key="SecondColumnStyle" TargetType="ColumnDefinition">
@ -252,7 +262,11 @@
</ScrollViewer> </ScrollViewer>
</Border> </Border>
<!-- Theme Preview --> <!-- Theme Preview -->
<Border Grid.Column="0" Background="{Binding PreviewBackground}"> <Border
Grid.Column="0"
Background="{Binding PreviewBackground}"
SnapsToDevicePixels="True"
UseLayoutRounding="True">
<Border.Style> <Border.Style>
<Style TargetType="{x:Type Border}"> <Style TargetType="{x:Type Border}">
<Setter Property="CornerRadius" Value="6 0 0 6" /> <Setter Property="CornerRadius" Value="6 0 0 6" />
@ -290,16 +304,8 @@
Width="400" Width="400"
Margin="40 30 0 30" Margin="40 30 0 30"
SnapsToDevicePixels="True" SnapsToDevicePixels="True"
Style="{DynamicResource WindowBorderStyle}" Style="{DynamicResource WindowBorderStyle}">
UseLayoutRounding="True"> <Border BorderThickness="0" Style="{DynamicResource WindowRadius}">
<Border Style="{DynamicResource WindowRadius}">
<Border.Clip>
<MultiBinding Converter="{StaticResource BorderClipConverter}">
<Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
<Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
<Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
</MultiBinding>
</Border.Clip>
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
@ -378,122 +384,91 @@
</cc:Card> </cc:Card>
<!-- Theme --> <!-- Theme -->
<Border <cc:ExCard
Height="64" x:Name="ThemeCard"
Title="{DynamicResource theme}"
Margin="0 8 0 0" Margin="0 8 0 0"
CornerRadius="5 5 0 0" Icon="&#xe790;">
Style="{DynamicResource SettingGroupBox}"> <cc:ExCard.SideContent>
<ItemsControl Style="{StaticResource SettingGrid}"> <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
<StackPanel Style="{StaticResource TextPanel}"> <ui:FontIcon
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource theme}" /> Margin="0 2 8 0"
VerticalAlignment="Center"
FontSize="12"
Glyph="&#xED66;"
Visibility="{Binding SelectedTheme.IsDark, Converter={StaticResource BoolToVisibilityConverter}}" />
<ui:FontIcon
Margin="0 2 8 0"
VerticalAlignment="Center"
FontSize="12"
Glyph="&#xEB42;"
Visibility="{Binding SelectedTheme.HasBlur, Converter={StaticResource BoolToVisibilityConverter}}" />
<TextBlock Text="{Binding SelectedTheme.Name}" />
</StackPanel> </StackPanel>
<TextBlock Style="{StaticResource Glyph}"> </cc:ExCard.SideContent>
&#xe790;
</TextBlock>
</ItemsControl>
</Border>
<Border
Margin="0"
Padding="0"
HorizontalAlignment="Stretch"
BorderThickness="1 0 1 1"
CornerRadius="0 0 5 5"
Style="{DynamicResource SettingGroupBox}">
<ListBox <ListBox
Margin="12" HorizontalAlignment="Stretch"
HorizontalAlignment="Center" HorizontalContentAlignment="Stretch"
HorizontalContentAlignment="Center" Background="Transparent"
ui:ScrollViewerHelper.AutoHideScrollBars="True" ItemContainerStyle="{DynamicResource ThemeList}"
Background="#ffffff"
ItemsSource="{Binding Themes}" ItemsSource="{Binding Themes}"
ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Disabled"
SelectedItem="{Binding SelectedTheme}"> SelectedValue="{Binding SelectedTheme}">
<ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem">
<Setter Property="Background" Value="Transparent" />
<Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
<Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
<Setter Property="Padding" Value="0" />
<Setter Property="Margin" Value="4" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ListBoxItem}">
<Border
x:Name="Bd"
Padding="{TemplateBinding Padding}"
Background="{DynamicResource Color12B}"
BorderBrush="{DynamicResource Color03B}"
BorderThickness="1 1 1 0"
CornerRadius="4"
SnapsToDevicePixels="true">
<Border
x:Name="Bd2"
BorderBrush="{DynamicResource Color14B}"
BorderThickness="0 0 0 2"
CornerRadius="4">
<ContentPresenter
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</Border>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="true">
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource ThemeHoverButton}" />
</Trigger>
<Trigger Property="IsSelected" Value="true">
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource ToggleSwitchFillOn}" />
<Setter TargetName="Bd2" Property="BorderThickness" Value="0" />
<Setter TargetName="Bd2" Property="TextElement.Foreground" Value="{DynamicResource Color02B}" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ListBox.ItemContainerStyle>
<ListBox.Template>
<!-- For Scroll Wheel inside listbox area -->
<ControlTemplate>
<ItemsPresenter />
</ControlTemplate>
</ListBox.Template>
<ListBox.ItemTemplate>
<DataTemplate>
<Grid
Width="Auto"
Height="34"
Margin="0">
<TextBlock
x:Name="ThemeName"
Margin="0"
Padding="14 12"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Focusable="True"
FontSize="12"
Text="{Binding}"
TextWrapping="Wrap" />
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
<ListBox.ItemsPanel> <ListBox.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<WrapPanel /> <WrapPanel />
</ItemsPanelTemplate> </ItemsPanelTemplate>
</ListBox.ItemsPanel> </ListBox.ItemsPanel>
<ListBox.ItemTemplate>
<DataTemplate>
<Grid
Width="Auto"
Height="34"
Margin="0"
Focusable="True">
<StackPanel Margin="14 2 14 0" Orientation="Horizontal">
<TextBlock
Margin="0 0 0 0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Text="{Binding Name}"
TextWrapping="Wrap" />
<ui:FontIcon
Margin="8 1 0 0"
VerticalAlignment="Center"
FontSize="12"
Glyph="&#xED66;"
Visibility="{Binding IsDark, Converter={StaticResource BoolToVisibilityConverter}}" />
<ui:FontIcon
Margin="8 1 0 0"
VerticalAlignment="Center"
FontSize="12"
Glyph="&#xEB42;"
Visibility="{Binding HasBlur, Converter={StaticResource BoolToVisibilityConverter}}" />
</StackPanel>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
<ListBox.Template>
<ControlTemplate>
<Border
Padding="18 12 18 12"
BorderBrush="{DynamicResource Color03B}"
BorderThickness="0 1 0 0">
<ItemsPresenter />
</Border>
</ControlTemplate>
</ListBox.Template>
</ListBox> </ListBox>
</cc:ExCard>
</Border>
<cc:HyperLink <cc:HyperLink
Margin="10" Margin="10"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Text="{DynamicResource browserMoreThemes}" Text="{DynamicResource browserMoreThemes}"
Uri="{Binding LinkThemeGallery}" /> Uri="{Binding LinkThemeGallery}" />
<!-- Fixed Height -->
<cc:CardGroup Margin="0 20 0 0"> <cc:CardGroup Margin="0 20 0 0">
<cc:Card <cc:Card
Title="{DynamicResource KeepMaxResults}" Title="{DynamicResource KeepMaxResults}"

38
Flow.Launcher/Themes/Base.xaml
View file

@ -29,7 +29,7 @@
<Setter Property="FontSize" Value="28" /> <Setter Property="FontSize" Value="28" />
<Setter Property="FontWeight" Value="Regular" /> <Setter Property="FontWeight" Value="Regular" />
<Setter Property="Margin" Value="16 7 0 7" /> <Setter Property="Margin" Value="16 7 0 7" />
<Setter Property="Padding" Value="0 4 68 0" /> <Setter Property="Padding" Value="0 0 68 0" />
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="Height" Value="48" /> <Setter Property="Height" Value="48" />
<Setter Property="Foreground" Value="#E3E0E3" /> <Setter Property="Foreground" Value="#E3E0E3" />
@ -69,7 +69,7 @@
<!-- Further font customisations are dynamically loaded in Theme.cs --> <!-- Further font customisations are dynamically loaded in Theme.cs -->
<Style x:Key="BaseQueryBoxBgStyle" TargetType="{x:Type Border}"> <Style x:Key="BaseQueryBoxBgStyle" TargetType="{x:Type Border}">
<Setter Property="Margin" Value="0 2 0 0" /> <Setter Property="Margin" Value="0 0 0 0" />
</Style> </Style>
<Style <Style
x:Key="QueryBoxBgStyle" x:Key="QueryBoxBgStyle"
@ -83,9 +83,10 @@
<Setter Property="Height" Value="48" /> <Setter Property="Height" Value="48" />
<Setter Property="Margin" Value="16 7 0 7" /> <Setter Property="Margin" Value="16 7 0 7" />
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="Padding" Value="0 4 68 0" /> <Setter Property="Padding" Value="0 0 68 0" />
<Setter Property="HorizontalAlignment" Value="Stretch" /> <Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="VerticalContentAlignment" Value="Center" />
</Style> </Style>
<Style x:Key="BaseWindowBorderStyle" TargetType="{x:Type Border}"> <Style x:Key="BaseWindowBorderStyle" TargetType="{x:Type Border}">
@ -97,6 +98,7 @@
<Setter Property="SnapsToDevicePixels" Value="True" /> <Setter Property="SnapsToDevicePixels" Value="True" />
</Style> </Style>
<Style x:Key="BaseWindowStyle" TargetType="{x:Type Window}"> <Style x:Key="BaseWindowStyle" TargetType="{x:Type Window}">
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
<Setter Property="Width" Value="600" /> <Setter Property="Width" Value="600" />
</Style> </Style>
@ -120,13 +122,15 @@
</Style> </Style>
<Style x:Key="BaseClockBox" TargetType="{x:Type TextBlock}"> <Style x:Key="BaseClockBox" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="20" /> <Setter Property="FontSize" Value="20" />
<Setter Property="Padding" Value="0" />
<Setter Property="Foreground" Value="#8f8f8f" /> <Setter Property="Foreground" Value="#8f8f8f" />
<Setter Property="HorizontalAlignment" Value="Right" /> <Setter Property="HorizontalAlignment" Value="Right" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="0 0 0 0" /> <Setter Property="Margin" Value="0 0 0 3" />
<Style.Triggers> <Style.Triggers>
<DataTrigger Binding="{Binding ElementName=DateBox, Path=Visibility}" Value="Visible"> <DataTrigger Binding="{Binding ElementName=DateBox, Path=Visibility}" Value="Visible">
<Setter Property="FontSize" Value="14" /> <Setter Property="FontSize" Value="14" />
<Setter Property="Margin" Value="0 0 0 0" />
</DataTrigger> </DataTrigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
@ -139,6 +143,7 @@
<Style.Triggers> <Style.Triggers>
<DataTrigger Binding="{Binding ElementName=ClockBox, Path=Visibility}" Value="Visible"> <DataTrigger Binding="{Binding ElementName=ClockBox, Path=Visibility}" Value="Visible">
<Setter Property="FontSize" Value="14" /> <Setter Property="FontSize" Value="14" />
<Setter Property="Margin" Value="0 0 0 3" />
</DataTrigger> </DataTrigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
@ -398,16 +403,30 @@
<Style x:Key="BaseSearchIconPosition" TargetType="{x:Type Canvas}"> <Style x:Key="BaseSearchIconPosition" TargetType="{x:Type Canvas}">
<Setter Property="Width" Value="32" /> <Setter Property="Width" Value="32" />
<Setter Property="Height" Value="32" /> <Setter Property="Height" Value="32" />
<Setter Property="Margin" Value="0 2 18 0" /> <Setter Property="Margin" Value="0 0 18 0" />
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="HorizontalAlignment" Value="Right" /> <Setter Property="HorizontalAlignment" Value="Right" />
</Style> </Style>
<Style x:Key="BasePreviewBorderStyle" TargetType="{x:Type Border}"> <Style x:Key="BasePreviewBorderStyle" TargetType="{x:Type Border}">
<Setter Property="BorderThickness" Value="1 0 0 0" /> <Setter Property="BorderThickness" Value="1 0 0 0" />
<Setter Property="Width" Value="5" />
<Setter Property="BorderBrush" Value="#FFEAEAEA" /> <Setter Property="BorderBrush" Value="#FFEAEAEA" />
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="Margin" Value="0 0 10 10" /> <Setter Property="Margin" Value="0 0 10 10" />
<Setter Property="Background" Value="Transparent" />
<Style.Triggers>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding ElementName=ResultListBox, Path=Items.Count}" Value="0" />
</MultiDataTrigger.Conditions>
<MultiDataTrigger.Setters>
<Setter Property="Height" Value="0" />
<Setter Property="Margin" Value="0" />
</MultiDataTrigger.Setters>
</MultiDataTrigger>
</Style.Triggers>
</Style> </Style>
<Style x:Key="BasePreviewGlyph" TargetType="{x:Type TextBlock}"> <Style x:Key="BasePreviewGlyph" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#555555" /> <Setter Property="Foreground" Value="#555555" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
@ -432,7 +451,7 @@
<Style x:Key="PreviewSep" TargetType="{x:Type Separator}"> <Style x:Key="PreviewSep" TargetType="{x:Type Separator}">
<Setter Property="Visibility" Value="Visible" /> <Setter Property="Visibility" Value="Visible" />
<Setter Property="Background" Value="{Binding ElementName=MiddleSeparator, Path=Fill}" /> <Setter Property="Background" Value="{Binding ElementName=MiddleSeparator, Path=Fill}" />
<Setter Property="Margin" Value="0 15 0 5" /> <Setter Property="Margin" Value="0 15 5 5" />
<Style.Triggers> <Style.Triggers>
<DataTrigger Binding="{Binding ElementName=PreviewSubTitle, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0"> <DataTrigger Binding="{Binding ElementName=PreviewSubTitle, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0">
<Setter Property="Visibility" Value="Collapsed" /> <Setter Property="Visibility" Value="Collapsed" />
@ -444,6 +463,7 @@
BasedOn="{StaticResource BasePreviewBorderStyle}" BasedOn="{StaticResource BasePreviewBorderStyle}"
TargetType="{x:Type Border}"> TargetType="{x:Type Border}">
<Setter Property="BorderBrush" Value="Gray" /> <Setter Property="BorderBrush" Value="Gray" />
</Style> </Style>
<Style x:Key="PreviewArea" TargetType="{x:Type Grid}"> <Style x:Key="PreviewArea" TargetType="{x:Type Grid}">
@ -480,7 +500,7 @@
<Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}"> <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
<Setter Property="Width" Value="32" /> <Setter Property="Width" Value="32" />
<Setter Property="Height" Value="32" /> <Setter Property="Height" Value="32" />
<Setter Property="Margin" Value="0 2 18 0" /> <Setter Property="Margin" Value="0 0 18 0" />
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="HorizontalAlignment" Value="Right" /> <Setter Property="HorizontalAlignment" Value="Right" />
</Style> </Style>
@ -488,7 +508,7 @@
x:Key="ClockPanelPosition" x:Key="ClockPanelPosition"
BasedOn="{StaticResource BaseClockPanelPosition}" BasedOn="{StaticResource BaseClockPanelPosition}"
TargetType="{x:Type Canvas}"> TargetType="{x:Type Canvas}">
<Setter Property="Margin" Value="0 2 66 0" /> <Setter Property="Margin" Value="0 0 66 0" />
</Style> </Style>
<Style <Style
x:Key="ItemHotkeyStyle" x:Key="ItemHotkeyStyle"
@ -530,7 +550,7 @@
<Setter Property="Foreground" Value="#8f8f8f" /> <Setter Property="Foreground" Value="#8f8f8f" />
<Setter Property="FontSize" Value="12" /> <Setter Property="FontSize" Value="12" />
<Setter Property="FontWeight" Value="Normal" /> <Setter Property="FontWeight" Value="Normal" />
<Setter Property="Margin" Value="0 6 0 10" /> <Setter Property="Margin" Value="5 6 0 10" />
<Setter Property="HorizontalAlignment" Value="Stretch" /> <Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="LineHeight" Value="18" /> <Setter Property="LineHeight" Value="18" />
<Setter Property="TextAlignment" Value="Left" /> <Setter Property="TextAlignment" Value="Left" />

9
Flow.Launcher/Themes/BlurBlack Darker.xaml
View file

@ -1,4 +1,9 @@
<ResourceDictionary <!--
Name: Blur Black Darker
IsDark: False
HasBlur: True
-->
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=mscorlib"> xmlns:system="clr-namespace:System;assembly=mscorlib">
@ -53,7 +58,7 @@
TargetType="{x:Type Rectangle}"> TargetType="{x:Type Rectangle}">
<Setter Property="Fill" Value="#444444" /> <Setter Property="Fill" Value="#444444" />
<Setter Property="Height" Value="1" /> <Setter Property="Height" Value="1" />
<Setter Property="Margin" Value="12,0,12,8" /> <Setter Property="Margin" Value="12 0 12 8" />
</Style> </Style>
<Style <Style

11
Flow.Launcher/Themes/BlurBlack.xaml
View file

@ -1,4 +1,9 @@
<ResourceDictionary <!--
Name: Blur Black
IsDark: False
HasBlur: True
-->
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=mscorlib"> xmlns:system="clr-namespace:System;assembly=mscorlib">
@ -51,7 +56,7 @@
TargetType="{x:Type Rectangle}"> TargetType="{x:Type Rectangle}">
<Setter Property="Fill" Value="#444444" /> <Setter Property="Fill" Value="#444444" />
<Setter Property="Height" Value="1" /> <Setter Property="Height" Value="1" />
<Setter Property="Margin" Value="12,0,12,8" /> <Setter Property="Margin" Value="12 0 12 8" />
</Style> </Style>
<Style <Style
@ -168,4 +173,4 @@
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#FFFFFFFF" /> <Setter Property="Foreground" Value="#FFFFFFFF" />
</Style> </Style>
</ResourceDictionary> </ResourceDictionary>

9
Flow.Launcher/Themes/BlurWhite.xaml
View file

@ -1,4 +1,9 @@
<ResourceDictionary <!--
Name: Blur White
IsDark: False
HasBlur: True
-->
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=mscorlib"> xmlns:system="clr-namespace:System;assembly=mscorlib">
@ -96,7 +101,7 @@
TargetType="{x:Type Rectangle}"> TargetType="{x:Type Rectangle}">
<Setter Property="Fill" Value="#c6c6c6" /> <Setter Property="Fill" Value="#c6c6c6" />
<Setter Property="Height" Value="1" /> <Setter Property="Height" Value="1" />
<Setter Property="Margin" Value="12,0,12,8" /> <Setter Property="Margin" Value="12 0 12 8" />
</Style> </Style>
<!-- button style in the middle of the scrollbar --> <!-- button style in the middle of the scrollbar -->
<Style <Style

209
Flow.Launcher/Themes/Bullet Light.xaml
View file

@ -1,209 +0,0 @@
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=mscorlib">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
</ResourceDictionary.MergedDictionaries>
<Style
x:Key="BulletStyle"
BasedOn="{StaticResource BaseBulletStyle}"
TargetType="{x:Type Border}">
<Setter Property="Width" Value="4" />
<Setter Property="Height" Value="42" />
<Setter Property="Background" Value="Transparent" />
</Style>
<Style
x:Key="ItemBulletSelectedStyle"
BasedOn="{StaticResource BaseBulletStyle}"
TargetType="{x:Type Border}">
<Setter Property="Width" Value="4" />
<Setter Property="Height" Value="42" />
<Setter Property="CornerRadius" Value="2" />
<Setter Property="Background" Value="#8897ea" />
</Style>
<Style
x:Key="ItemGlyph"
BasedOn="{StaticResource BaseGlyphStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#2b2b2e" />
<Setter Property="Margin" Value="-4,0,0,0" />
</Style>
<Style
x:Key="QueryBoxStyle"
BasedOn="{StaticResource BaseQueryBoxStyle}"
TargetType="{x:Type TextBox}">
<Setter Property="Padding" Value="0,4,50,0" />
<Setter Property="Foreground" Value="#999aa3" />
<Setter Property="FontSize" Value="18" />
<Setter Property="Height" Value="38" />
</Style>
<Style
x:Key="QuerySuggestionBoxStyle"
BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
TargetType="{x:Type TextBox}">
<Setter Property="Background" Value="Transparent" />
<Setter Property="Padding" Value="0,4,50,0" />
<Setter Property="Height" Value="38" />
<Setter Property="FontSize" Value="18" />
<Setter Property="Foreground" Value="#d9d9d9" />
</Style>
<Style
x:Key="WindowBorderStyle"
BasedOn="{StaticResource BaseWindowBorderStyle}"
TargetType="{x:Type Border}">
<Setter Property="BorderThickness" Value="1" />
<Setter Property="BorderBrush" Value="#e2e2e2" />
<Setter Property="Background" Value="#fffeff" />
<Setter Property="CornerRadius" Value="8" />
<Setter Property="UseLayoutRounding" Value="True" />
</Style>
<Style
x:Key="WindowStyle"
BasedOn="{StaticResource BaseWindowStyle}"
TargetType="{x:Type Window}" />
<Style
x:Key="PendingLineStyle"
BasedOn="{StaticResource BasePendingLineStyle}"
TargetType="{x:Type Line}" />
<!-- Item Style -->
<Style
x:Key="ItemTitleStyle"
BasedOn="{StaticResource BaseItemTitleStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#2b2b2e" />
</Style>
<Style
x:Key="ItemSubTitleStyle"
BasedOn="{StaticResource BaseItemSubTitleStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#949394" />
</Style>
<Style
x:Key="SeparatorStyle"
BasedOn="{StaticResource BaseSeparatorStyle}"
TargetType="{x:Type Rectangle}">
<Setter Property="Fill" Value="#e2e2e2" />
<Setter Property="Height" Value="1" />
<Setter Property="Margin" Value="0,0,0,8" />
</Style>
<Style x:Key="HighlightStyle" />
<Style
x:Key="ItemTitleSelectedStyle"
BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#2b2b2e" />
</Style>
<Style
x:Key="ItemSubTitleSelectedStyle"
BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#949394" />
</Style>
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#f1f1f1</SolidColorBrush>
<!-- button style in the middle of the scrollbar -->
<Style
x:Key="ThumbStyle"
BasedOn="{StaticResource BaseThumbStyle}"
TargetType="{x:Type Thumb}">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Thumb}">
<Border
Background="#d9d9d9"
BorderBrush="Transparent"
BorderThickness="0"
CornerRadius="2"
DockPanel.Dock="Right" />
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style
x:Key="ScrollBarStyle"
BasedOn="{StaticResource BaseScrollBarStyle}"
TargetType="{x:Type ScrollBar}" />
<Style
x:Key="SearchIconStyle"
BasedOn="{StaticResource BaseSearchIconStyle}"
TargetType="{x:Type Path}">
<Setter Property="Fill" Value="#d9d9d9" />
<Setter Property="Width" Value="24" />
<Setter Property="Height" Value="24" />
</Style>
<Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
<Setter Property="Background" Value="#fffeff" />
<Setter Property="Width" Value="32" />
<Setter Property="Height" Value="32" />
<Setter Property="Margin" Value="0,8,8,0" />
<Setter Property="HorizontalAlignment" Value="Right" />
</Style>
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="12" />
<Setter Property="Foreground" Value="#87888b" />
</Style>
<Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="12" />
<Setter Property="Foreground" Value="#87888b" />
</Style>
<Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#808dd5" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="Margin" Value="-4,0,0,0" />
<Setter Property="Width" Value="25" />
<Setter Property="Height" Value="25" />
<Setter Property="FontSize" Value="25" />
</Style>
<CornerRadius x:Key="ItemRadius">5</CornerRadius>
<Thickness x:Key="ItemMargin">10 0 10 0</Thickness>
<Thickness x:Key="ResultMargin">0 0 0 10</Thickness>
<Style
x:Key="ClockPanel"
BasedOn="{StaticResource ClockPanel}"
TargetType="{x:Type StackPanel}">
<Setter Property="Margin" Value="0,0,54,0" />
</Style>
<Style
x:Key="ClockBox"
BasedOn="{StaticResource BaseClockBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#c1c1c1" />
</Style>
<Style
x:Key="DateBox"
BasedOn="{StaticResource BaseDateBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#c1c1c1" />
</Style>
<Style
x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}"
TargetType="{x:Type Border}">
<Setter Property="BorderBrush" Value="#e2e2e2" />
</Style>
<Style
x:Key="PreviewItemTitleStyle"
BasedOn="{StaticResource BasePreviewItemTitleStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#2b2b2e" />
</Style>
<Style
x:Key="PreviewItemSubTitleStyle"
BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#949394" />
</Style>
<Style
x:Key="PreviewGlyph"
BasedOn="{StaticResource BasePreviewGlyph}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#2b2b2e" />
</Style>
</ResourceDictionary>

190
Flow.Launcher/Themes/Circle Light.xaml
View file

@ -1,190 +0,0 @@
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=mscorlib">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
</ResourceDictionary.MergedDictionaries>
<Style
x:Key="ItemGlyph"
BasedOn="{StaticResource BaseGlyphStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#9da1aa" />
</Style>
<Style
x:Key="QueryBoxStyle"
BasedOn="{StaticResource BaseQueryBoxStyle}"
TargetType="{x:Type TextBox}">
<Setter Property="Foreground" Value="#999aa3" />
<Setter Property="Padding" Value="0,4,50,0" />
<Setter Property="FontSize" Value="18" />
<Setter Property="Height" Value="38" />
</Style>
<Style
x:Key="QuerySuggestionBoxStyle"
BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
TargetType="{x:Type TextBox}">
<Setter Property="Background" Value="Transparent" />
<Setter Property="Padding" Value="0,4,50,0" />
<Setter Property="Height" Value="38" />
<Setter Property="FontSize" Value="18" />
<Setter Property="Foreground" Value="#d9d9d9" />
</Style>
<Style
x:Key="WindowBorderStyle"
BasedOn="{StaticResource BaseWindowBorderStyle}"
TargetType="{x:Type Border}">
<Setter Property="BorderThickness" Value="1" />
<Setter Property="BorderBrush" Value="#e2e2e2" />
<Setter Property="Background" Value="White" />
<Setter Property="CornerRadius" Value="8" />
<Setter Property="UseLayoutRounding" Value="True" />
</Style>
<Style
x:Key="WindowStyle"
BasedOn="{StaticResource BaseWindowStyle}"
TargetType="{x:Type Window}" />
<Style
x:Key="PendingLineStyle"
BasedOn="{StaticResource BasePendingLineStyle}"
TargetType="{x:Type Line}" />
<!-- Item Style -->
<Style
x:Key="ItemTitleStyle"
BasedOn="{StaticResource BaseItemTitleStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#3d434a" />
</Style>
<Style
x:Key="ItemSubTitleStyle"
BasedOn="{StaticResource BaseItemSubTitleStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#9da1aa" />
</Style>
<Style
x:Key="SeparatorStyle"
BasedOn="{StaticResource BaseSeparatorStyle}"
TargetType="{x:Type Rectangle}">
<Setter Property="Fill" Value="#e2e2e2" />
<Setter Property="Height" Value="1" />
<Setter Property="Margin" Value="0,0,0,8" />
</Style>
<Style x:Key="HighlightStyle" />
<Style
x:Key="ItemTitleSelectedStyle"
BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#ffffff" />
</Style>
<Style
x:Key="ItemSubTitleSelectedStyle"
BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#ffffff" />
</Style>
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#5046e5</SolidColorBrush>
<!-- button style in the middle of the scrollbar -->
<Style
x:Key="ThumbStyle"
BasedOn="{StaticResource BaseThumbStyle}"
TargetType="{x:Type Thumb}">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Thumb}">
<Border
Background="#a0a8b5"
BorderBrush="Transparent"
BorderThickness="0"
CornerRadius="2"
DockPanel.Dock="Right" />
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style
x:Key="ScrollBarStyle"
BasedOn="{StaticResource BaseScrollBarStyle}"
TargetType="{x:Type ScrollBar}" />
<Style
x:Key="SearchIconStyle"
BasedOn="{StaticResource BaseSearchIconStyle}"
TargetType="{x:Type Path}">
<Setter Property="Fill" Value="#9da1aa" />
<Setter Property="Width" Value="24" />
<Setter Property="Height" Value="24" />
</Style>
<Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
<Setter Property="Background" Value="White" />
<Setter Property="Width" Value="32" />
<Setter Property="Height" Value="32" />
<Setter Property="Margin" Value="0,8,8,0" />
<Setter Property="HorizontalAlignment" Value="Right" />
</Style>
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="12" />
<Setter Property="Foreground" Value="#9da1aa" />
</Style>
<Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="12" />
<Setter Property="Foreground" Value="#ffffff" />
</Style>
<Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#ffffff" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="Width" Value="25" />
<Setter Property="Height" Value="25" />
<Setter Property="FontSize" Value="25" />
</Style>
<CornerRadius x:Key="ItemRadius">8</CornerRadius>
<Thickness x:Key="ItemMargin">10 0 10 0</Thickness>
<Thickness x:Key="ResultMargin">0 0 0 10</Thickness>
<Style
x:Key="ClockPanel"
BasedOn="{StaticResource ClockPanel}"
TargetType="{x:Type StackPanel}">
<Setter Property="Margin" Value="0,0,54,0" />
</Style>
<Style
x:Key="ClockBox"
BasedOn="{StaticResource BaseClockBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#999aa3" />
</Style>
<Style
x:Key="DateBox"
BasedOn="{StaticResource BaseDateBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#999aa3" />
</Style>
<Style
x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}"
TargetType="{x:Type Border}">
<Setter Property="BorderBrush" Value="#e2e2e2" />
</Style>
<Style
x:Key="PreviewItemTitleStyle"
BasedOn="{StaticResource BasePreviewItemTitleStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#3d434a" />
</Style>
<Style
x:Key="PreviewItemSubTitleStyle"
BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#9da1aa" />
</Style>
<Style
x:Key="PreviewGlyph"
BasedOn="{StaticResource BasePreviewGlyph}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#9da1aa" />
</Style>
</ResourceDictionary>

17
Flow.Launcher/Themes/Circle System.xaml
View file

@ -1,3 +1,8 @@
<!--
Name: Circle
IsDark: True
HasBlur: False
-->
<ResourceDictionary <ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@ -17,7 +22,7 @@
x:Key="QueryBoxStyle" x:Key="QueryBoxStyle"
BasedOn="{StaticResource BaseQueryBoxStyle}" BasedOn="{StaticResource BaseQueryBoxStyle}"
TargetType="{x:Type TextBox}"> TargetType="{x:Type TextBox}">
<Setter Property="Padding" Value="0,4,50,0" /> <Setter Property="Padding" Value="0 4 50 0" />
<Setter Property="Foreground" Value="{m:DynamicColor SystemControlPageTextBaseHighBrush}" /> <Setter Property="Foreground" Value="{m:DynamicColor SystemControlPageTextBaseHighBrush}" />
<Setter Property="FontSize" Value="18" /> <Setter Property="FontSize" Value="18" />
<Setter Property="Height" Value="38" /> <Setter Property="Height" Value="38" />
@ -27,7 +32,7 @@
x:Key="QuerySuggestionBoxStyle" x:Key="QuerySuggestionBoxStyle"
BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
TargetType="{x:Type TextBox}"> TargetType="{x:Type TextBox}">
<Setter Property="Padding" Value="0,4,50,0" /> <Setter Property="Padding" Value="0 4 50 0" />
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="Height" Value="38" /> <Setter Property="Height" Value="38" />
<Setter Property="FontSize" Value="18" /> <Setter Property="FontSize" Value="18" />
@ -72,7 +77,7 @@
TargetType="{x:Type Rectangle}"> TargetType="{x:Type Rectangle}">
<Setter Property="Fill" Value="{m:DynamicColor SystemControlBackgroundChromeMediumBrush}" /> <Setter Property="Fill" Value="{m:DynamicColor SystemControlBackgroundChromeMediumBrush}" />
<Setter Property="Height" Value="1" /> <Setter Property="Height" Value="1" />
<Setter Property="Margin" Value="0,0,0,8" /> <Setter Property="Margin" Value="0 0 0 8" />
</Style> </Style>
<Style x:Key="HighlightStyle" /> <Style x:Key="HighlightStyle" />
<Style <Style
@ -123,7 +128,7 @@
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="Width" Value="32" /> <Setter Property="Width" Value="32" />
<Setter Property="Height" Value="32" /> <Setter Property="Height" Value="32" />
<Setter Property="Margin" Value="0,8,8,0" /> <Setter Property="Margin" Value="0 8 8 0" />
<Setter Property="HorizontalAlignment" Value="Right" /> <Setter Property="HorizontalAlignment" Value="Right" />
</Style> </Style>
@ -150,7 +155,7 @@
x:Key="ClockPanel" x:Key="ClockPanel"
BasedOn="{StaticResource ClockPanel}" BasedOn="{StaticResource ClockPanel}"
TargetType="{x:Type StackPanel}"> TargetType="{x:Type StackPanel}">
<Setter Property="Margin" Value="0,0,54,0" /> <Setter Property="Margin" Value="0 0 54 0" />
</Style> </Style>
<Style <Style
x:Key="ClockBox" x:Key="ClockBox"
@ -188,4 +193,4 @@
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#9da1aa" /> <Setter Property="Foreground" Value="#9da1aa" />
</Style> </Style>
</ResourceDictionary> </ResourceDictionary>

6
Flow.Launcher/Themes/Cyan Dark.xaml
View file

@ -27,7 +27,7 @@
x:Key="ItemGlyph" x:Key="ItemGlyph"
BasedOn="{StaticResource BaseGlyphStyle}" BasedOn="{StaticResource BaseGlyphStyle}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#bbc1c3" /> <Setter Property="Foreground" Value="#eff2f2" />
</Style> </Style>
<Style <Style
x:Key="QueryBoxStyle" x:Key="QueryBoxStyle"
@ -139,7 +139,7 @@
<Setter Property="Height" Value="24" /> <Setter Property="Height" Value="24" />
</Style> </Style>
<Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}"> <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
<Setter Property="Background" Value="#0f1f26" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="Width" Value="32" /> <Setter Property="Width" Value="32" />
<Setter Property="Height" Value="32" /> <Setter Property="Height" Value="32" />
<Setter Property="Margin" Value="0,8,8,0" /> <Setter Property="Margin" Value="0,8,8,0" />
@ -155,7 +155,7 @@
<Setter Property="Foreground" Value="#ffffff" /> <Setter Property="Foreground" Value="#ffffff" />
</Style> </Style>
<Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}"> <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#58c2b4" /> <Setter Property="Foreground" Value="#eff2f2" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Center" /> <Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="Width" Value="25" /> <Setter Property="Width" Value="25" />

4
Flow.Launcher/Themes/Darker Glass.xaml
View file

@ -1,4 +1,4 @@
<ResourceDictionary <ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=mscorlib"> xmlns:system="clr-namespace:System;assembly=mscorlib">
@ -171,4 +171,4 @@
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#ebebeb" /> <Setter Property="Foreground" Value="#ebebeb" />
</Style> </Style>
</ResourceDictionary> </ResourceDictionary>

4
Flow.Launcher/Themes/Discord Dark.xaml
View file

@ -1,4 +1,4 @@
<ResourceDictionary <ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=mscorlib"> xmlns:system="clr-namespace:System;assembly=mscorlib">
@ -189,4 +189,4 @@
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#ffffff" /> <Setter Property="Foreground" Value="#ffffff" />
</Style> </Style>
</ResourceDictionary> </ResourceDictionary>

3
Flow.Launcher/Themes/Dracula.xaml
View file

@ -28,7 +28,6 @@
x:Key="QuerySuggestionBoxStyle" x:Key="QuerySuggestionBoxStyle"
BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
TargetType="{x:Type TextBox}"> TargetType="{x:Type TextBox}">
<Setter Property="Background" Value="#282a36" />
<Setter Property="Foreground" Value="#6272a4" /> <Setter Property="Foreground" Value="#6272a4" />
<Setter Property="FontSize" Value="26" /> <Setter Property="FontSize" Value="26" />
<Setter Property="Padding" Value="0,4,66,0" /> <Setter Property="Padding" Value="0,4,66,0" />
@ -98,7 +97,7 @@
<Setter Property="Cursor" Value="Arrow" /> <Setter Property="Cursor" Value="Arrow" />
</Style> </Style>
<Style x:Key="HighlightStyle"> <Style x:Key="HighlightStyle">
<Setter Property="Inline.Foreground" Value="#bd93f9" /> <Setter Property="Inline.FontWeight" Value="SemiBold" />
</Style> </Style>
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}"> <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="13" /> <Setter Property="FontSize" Value="13" />

1
Flow.Launcher/Themes/Gray.xaml
View file

@ -11,7 +11,6 @@
BasedOn="{StaticResource BaseGlyphStyle}" BasedOn="{StaticResource BaseGlyphStyle}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#c6c8cb" /> <Setter Property="Foreground" Value="#c6c8cb" />
<Setter Property="Margin" Value="-4,0,0,0" />
</Style> </Style>
<Style <Style
x:Key="QueryBoxStyle" x:Key="QueryBoxStyle"

2
Flow.Launcher/Themes/League.xaml
View file

@ -1,4 +1,4 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" /> <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>

1
Flow.Launcher/Themes/Nord Darker.xaml
View file

@ -22,7 +22,6 @@
x:Key="QuerySuggestionBoxStyle" x:Key="QuerySuggestionBoxStyle"
BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
TargetType="{x:Type TextBox}"> TargetType="{x:Type TextBox}">
<Setter Property="Background" Value="#2e3440" />
<Setter Property="Foreground" Value="#50596b" /> <Setter Property="Foreground" Value="#50596b" />
<Setter Property="FontSize" Value="30" /> <Setter Property="FontSize" Value="30" />
</Style> </Style>

69
Flow.Launcher/Themes/Pink.xaml
View file

@ -2,45 +2,46 @@
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" /> <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<Thickness x:Key="ResultMargin">0 0 0 4</Thickness> <Thickness x:Key="ResultMargin">0 0 0 0</Thickness>
<Style <Style
x:Key="ItemGlyph" x:Key="ItemGlyph"
BasedOn="{StaticResource BaseGlyphStyle}" BasedOn="{StaticResource BaseGlyphStyle}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#ffffff" /> <Setter Property="Foreground" Value="#0e172c" />
</Style> </Style>
<Style <Style
x:Key="QueryBoxStyle" x:Key="QueryBoxStyle"
BasedOn="{StaticResource BaseQueryBoxStyle}" BasedOn="{StaticResource BaseQueryBoxStyle}"
TargetType="{x:Type TextBox}"> TargetType="{x:Type TextBox}">
<Setter Property="Foreground" Value="#cc1081" /> <Setter Property="Foreground" Value="#0E172C" />
<Setter Property="CaretBrush" Value="#cc1081" /> <Setter Property="CaretBrush" Value="#0E172C" />
<Setter Property="SelectionBrush" Value="#e564b1" /> <Setter Property="SelectionBrush" Value="#a786df" />
</Style> </Style>
<Style <Style
x:Key="QuerySuggestionBoxStyle" x:Key="QuerySuggestionBoxStyle"
BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
TargetType="{x:Type TextBox}"> TargetType="{x:Type TextBox}">
<Setter Property="Background" Value="#1f1d1f" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="Foreground" Value="#71114b" /> <Setter Property="Foreground" Value="#E9819F" />
</Style> </Style>
<Style <Style
x:Key="WindowBorderStyle" x:Key="WindowBorderStyle"
BasedOn="{StaticResource BaseWindowBorderStyle}" BasedOn="{StaticResource BaseWindowBorderStyle}"
TargetType="{x:Type Border}"> TargetType="{x:Type Border}">
<Setter Property="Background" Value="#1f1d1f" /> <Setter Property="CornerRadius" Value="8" />
<Setter Property="BorderThickness" Value="2" /> <Setter Property="Background" Value="#fec7d7" />
<Setter Property="BorderBrush" Value="#000000" /> <Setter Property="BorderThickness" Value="3" />
<Setter Property="BorderBrush" Value="#0e172c" />
</Style> </Style>
<Style <Style
x:Key="SeparatorStyle" x:Key="SeparatorStyle"
BasedOn="{StaticResource BaseSeparatorStyle}" BasedOn="{StaticResource BaseSeparatorStyle}"
TargetType="{x:Type Rectangle}"> TargetType="{x:Type Rectangle}">
<Setter Property="Fill" Value="#000000" /> <Setter Property="Fill" Value="#0e172c" />
<Setter Property="Height" Value="1" /> <Setter Property="Height" Value="3" />
<Setter Property="Margin" Value="12,0,12,4" /> <Setter Property="Margin" Value="0 0 0 0" />
</Style> </Style>
<Style <Style
x:Key="WindowStyle" x:Key="WindowStyle"
@ -50,34 +51,33 @@
x:Key="PendingLineStyle" x:Key="PendingLineStyle"
BasedOn="{StaticResource BasePendingLineStyle}" BasedOn="{StaticResource BasePendingLineStyle}"
TargetType="{x:Type Line}"> TargetType="{x:Type Line}">
<Setter Property="Stroke" Value="#cc1081" /> <Setter Property="Stroke" Value="#a786df" />
</Style> </Style>
<Style <Style
x:Key="ItemTitleStyle" x:Key="ItemTitleStyle"
BasedOn="{StaticResource BaseItemTitleStyle}" BasedOn="{StaticResource BaseItemTitleStyle}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#f5f5f5" /> <Setter Property="Foreground" Value="#0e172c" />
</Style> </Style>
<Style <Style
x:Key="ItemSubTitleStyle" x:Key="ItemSubTitleStyle"
BasedOn="{StaticResource BaseItemSubTitleStyle}" BasedOn="{StaticResource BaseItemSubTitleStyle}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#c2c2c2" /> <Setter Property="Foreground" Value="#0e172c" />
<Setter Property="Opacity" Value="0.5" />
</Style> </Style>
<Style <Style
x:Key="ItemTitleSelectedStyle" x:Key="ItemTitleSelectedStyle"
BasedOn="{StaticResource BaseItemTitleSelectedStyle}" BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#f5f5f5" /> <Setter Property="Foreground" Value="#fffffe" />
</Style> </Style>
<Style <Style
x:Key="ItemSubTitleSelectedStyle" x:Key="ItemSubTitleSelectedStyle"
BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#ed92c9" /> <Setter Property="Foreground" Value="#fffffe" />
</Style> </Style>
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#cc1081</SolidColorBrush> <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#0e172c</SolidColorBrush>
<Style <Style
x:Key="ThumbStyle" x:Key="ThumbStyle"
BasedOn="{StaticResource BaseThumbStyle}" BasedOn="{StaticResource BaseThumbStyle}"
@ -86,7 +86,7 @@
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type Thumb}"> <ControlTemplate TargetType="{x:Type Thumb}">
<Border <Border
Background="#e564b1" Background="#E9819F"
BorderBrush="Transparent" BorderBrush="Transparent"
BorderThickness="0" BorderThickness="0"
CornerRadius="2" CornerRadius="2"
@ -104,58 +104,61 @@
<Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}"> <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
<Setter Property="Width" Value="34" /> <Setter Property="Width" Value="34" />
<Setter Property="Height" Value="34" /> <Setter Property="Height" Value="34" />
<Setter Property="Margin" Value="0,6,14,0" /> <Setter Property="Margin" Value="0 6 14 0" />
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="HorizontalAlignment" Value="Right" /> <Setter Property="HorizontalAlignment" Value="Right" />
</Style> </Style>
<Style x:Key="SearchIconStyle" TargetType="{x:Type Path}"> <Style x:Key="SearchIconStyle" TargetType="{x:Type Path}">
<Setter Property="Fill" Value="#cc1081" /> <Setter Property="Fill" Value="#E9819F" />
<Setter Property="Width" Value="28" /> <Setter Property="Width" Value="28" />
<Setter Property="Height" Value="28" /> <Setter Property="Height" Value="28" />
</Style> </Style>
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}"> <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="14" /> <Setter Property="FontSize" Value="11" />
<Setter Property="Foreground" Value="#ed92c9" /> <Setter Property="Foreground" Value="#E9819F" />
</Style> </Style>
<Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}"> <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="14" /> <Setter Property="FontSize" Value="11" />
<Setter Property="Foreground" Value="#ed92c9" /> <Setter Property="Foreground" Value="#E9819F" />
</Style> </Style>
<Style <Style
x:Key="ClockBox" x:Key="ClockBox"
BasedOn="{StaticResource BaseClockBox}" BasedOn="{StaticResource BaseClockBox}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#71114b" /> <Setter Property="Foreground" Value="#E9819F" />
</Style> </Style>
<Style <Style
x:Key="DateBox" x:Key="DateBox"
BasedOn="{StaticResource BaseDateBox}" BasedOn="{StaticResource BaseDateBox}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="FontWeight" Value="Bold" /> <Setter Property="FontWeight" Value="Bold" />
<Setter Property="Foreground" Value="#71114b" /> <Setter Property="Foreground" Value="#E9819F" />
</Style> </Style>
<Style <Style
x:Key="PreviewBorderStyle" x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}" BasedOn="{StaticResource BasePreviewBorderStyle}"
TargetType="{x:Type Border}"> TargetType="{x:Type Border}">
<Setter Property="BorderBrush" Value="#000000" /> <Setter Property="Margin" Value="0 0 10 0" />
<Setter Property="Width" Value="5" />
<Setter Property="BorderThickness" Value="3 0 0 0" />
<Setter Property="BorderBrush" Value="#0e172c" />
</Style> </Style>
<Style <Style
x:Key="PreviewItemTitleStyle" x:Key="PreviewItemTitleStyle"
BasedOn="{StaticResource BasePreviewItemTitleStyle}" BasedOn="{StaticResource BasePreviewItemTitleStyle}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#f5f5f5" /> <Setter Property="Foreground" Value="#0E172C" />
</Style> </Style>
<Style <Style
x:Key="PreviewItemSubTitleStyle" x:Key="PreviewItemSubTitleStyle"
BasedOn="{StaticResource BasePreviewItemSubTitleStyle}" BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#c2c2c2" /> <Setter Property="Foreground" Value="#0E172C" />
</Style> </Style>
<Style <Style
x:Key="PreviewGlyph" x:Key="PreviewGlyph"
BasedOn="{StaticResource BasePreviewGlyph}" BasedOn="{StaticResource BasePreviewGlyph}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#ffffff" /> <Setter Property="Foreground" Value="#0E172C" />
</Style> </Style>
</ResourceDictionary> </ResourceDictionary>

17
Flow.Launcher/Themes/SlimLight.xaml
View file

@ -179,15 +179,28 @@
BasedOn="{StaticResource BaseClockBox}" BasedOn="{StaticResource BaseClockBox}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="14" /> <Setter Property="FontSize" Value="14" />
<Setter Property="Foreground" Value="#8f8d90" /> <Setter Property="Foreground" Value="#bebebe" />
<Setter Property="Margin" Value="0,0,10,0" /> <Setter Property="Margin" Value="0,0,10,0" />
<Style.Triggers>
<DataTrigger Binding="{Binding ElementName=DateBox, Path=Visibility}" Value="Visible">
<Setter Property="FontSize" Value="14" />
<Setter Property="Margin" Value="0,0,10,3" />
</DataTrigger>
</Style.Triggers>
</Style> </Style>
<Style <Style
x:Key="DateBox" x:Key="DateBox"
BasedOn="{StaticResource BaseDateBox}" BasedOn="{StaticResource BaseDateBox}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="14" /> <Setter Property="FontSize" Value="14" />
<Setter Property="Foreground" Value="#8f8d90" /> <Setter Property="Foreground" Value="#bebebe" />
<Style.Triggers>
<DataTrigger Binding="{Binding ElementName=ClockBox, Path=Visibility}" Value="Visible">
<Setter Property="FontSize" Value="14" />
<Setter Property="Margin" Value="0,0,0,3" />
</DataTrigger>
</Style.Triggers>
</Style> </Style>
<Style <Style
x:Key="PreviewBorderStyle" x:Key="PreviewBorderStyle"

1
Flow.Launcher/Themes/Sublime.xaml
View file

@ -27,7 +27,6 @@
x:Key="QuerySuggestionBoxStyle" x:Key="QuerySuggestionBoxStyle"
BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
TargetType="{x:Type TextBox}"> TargetType="{x:Type TextBox}">
<Setter Property="Background" Value="#303840" />
<Setter Property="Foreground" Value="#798189" /> <Setter Property="Foreground" Value="#798189" />
<Setter Property="FontSize" Value="26" /> <Setter Property="FontSize" Value="26" />
<Setter Property="Height" Value="42" /> <Setter Property="Height" Value="42" />

4
Flow.Launcher/Themes/Ubuntu.xaml
View file

@ -160,7 +160,7 @@
<Setter Property="Foreground" Value="#c2c2c2" /> <Setter Property="Foreground" Value="#c2c2c2" />
</Style> </Style>
<Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}"> <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#fa7941" /> <Setter Property="Foreground" Value="#c2c2c2" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Center" /> <Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="Width" Value="25" /> <Setter Property="Width" Value="25" />
@ -174,7 +174,7 @@
x:Key="ClockPanel" x:Key="ClockPanel"
BasedOn="{StaticResource ClockPanel}" BasedOn="{StaticResource ClockPanel}"
TargetType="{x:Type StackPanel}"> TargetType="{x:Type StackPanel}">
<Setter Property="Margin" Value="0,0,54,0" /> <Setter Property="Margin" Value="0,0,54,2" />
</Style> </Style>
<Style <Style
x:Key="ClockBox" x:Key="ClockBox"

199
Flow.Launcher/Themes/Win10Light.xaml
View file

@ -1,199 +0,0 @@
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=mscorlib">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
</ResourceDictionary.MergedDictionaries>
<Thickness x:Key="ResultMargin">0 0 0 4</Thickness>
<Style
x:Key="ItemGlyph"
BasedOn="{StaticResource BaseGlyphStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#000000" />
</Style>
<Style
x:Key="ItemGlyphSelectedStyle"
BasedOn="{StaticResource BaseGlyphStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#000000" />
</Style>
<Style
x:Key="QueryBoxStyle"
BasedOn="{StaticResource BaseQueryBoxStyle}"
TargetType="{x:Type TextBox}">
<Setter Property="SelectionBrush" Value="#0a68d8" />
<Setter Property="FontSize" Value="24" />
<Setter Property="Foreground" Value="#000000" />
<Setter Property="CaretBrush" Value="#000000" />
<Setter Property="BorderBrush" Value="Black" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Height" Value="42" />
<Setter Property="Padding" Value="0,4,66,0" />
</Style>
<Style
x:Key="QuerySuggestionBoxStyle"
BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
TargetType="{x:Type TextBox}">
<Setter Property="Background" Value="#dddddd" />
<Setter Property="Foreground" Value="#c6c6c6" />
<Setter Property="FontSize" Value="24" />
<Setter Property="Padding" Value="0,4,66,0" />
<Setter Property="Height" Value="42" />
</Style>
<Style
x:Key="WindowBorderStyle"
BasedOn="{StaticResource BaseWindowBorderStyle}"
TargetType="{x:Type Border}">
<Setter Property="BorderThickness" Value="1" />
<Setter Property="BorderBrush" Value="#aaaaaa" />
<Setter Property="CornerRadius" Value="0" />
<Setter Property="Background" Value="#dddddd" />
</Style>
<Style
x:Key="WindowStyle"
BasedOn="{StaticResource BaseWindowStyle}"
TargetType="{x:Type Window}">
<Setter Property="Width" Value="576" />
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
</Style>
<Style
x:Key="PendingLineStyle"
BasedOn="{StaticResource BasePendingLineStyle}"
TargetType="{x:Type Line}">
<Setter Property="Stroke" Value="#0a68d8" />
</Style>
<!-- Item Style -->
<Style
x:Key="ItemTitleStyle"
BasedOn="{StaticResource BaseItemTitleStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#000000" />
</Style>
<Style
x:Key="ItemSubTitleStyle"
BasedOn="{StaticResource BaseItemSubTitleStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#818181" />
<Setter Property="FontSize" Value="13" />
</Style>
<Style
x:Key="ItemNumberStyle"
BasedOn="{StaticResource BaseItemNumberStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#818181" />
</Style>
<Style
x:Key="ItemTitleSelectedStyle"
BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Cursor" Value="Arrow" />
<Setter Property="Foreground" Value="#000000" />
</Style>
<Style
x:Key="ItemSubTitleSelectedStyle"
BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Cursor" Value="Arrow" />
<Setter Property="Foreground" Value="#72767d" />
</Style>
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#ccd0d4</SolidColorBrush>
<Style
x:Key="ItemImageSelectedStyle"
BasedOn="{StaticResource BaseItemImageSelectedStyle}"
TargetType="{x:Type Image}">
<Setter Property="Cursor" Value="Arrow" />
</Style>
<Style x:Key="HighlightStyle">
<Setter Property="Inline.Foreground" Value="#0078d7" />
</Style>
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="15" />
<Setter Property="Foreground" Value="#b2b2b2" />
</Style>
<Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="15" />
<Setter Property="Foreground" Value="#b2b2b2" />
</Style>
<!-- button style in the middle of the scrollbar -->
<Style
x:Key="ThumbStyle"
BasedOn="{StaticResource BaseThumbStyle}"
TargetType="{x:Type Thumb}">
<Setter Property="SnapsToDevicePixels" Value="True" />
<Setter Property="OverridesDefaultStyle" Value="true" />
<Setter Property="IsTabStop" Value="false" />
<Setter Property="Focusable" Value="false" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Thumb}">
<Border
Background="#bebebe"
BorderBrush="Transparent"
BorderThickness="0"
CornerRadius="2"
DockPanel.Dock="Right" />
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style
x:Key="ScrollBarStyle"
BasedOn="{StaticResource BaseScrollBarStyle}"
TargetType="{x:Type ScrollBar}" />
<Style
x:Key="SeparatorStyle"
BasedOn="{StaticResource BaseSeparatorStyle}"
TargetType="{x:Type Rectangle}">
<Setter Property="Fill" Value="#c6c6c6" />
<Setter Property="Height" Value="1" />
<Setter Property="Margin" Value="12,0,12,4" />
</Style>
<Style
x:Key="SearchIconStyle"
BasedOn="{StaticResource BaseSearchIconStyle}"
TargetType="{x:Type Path}">
<Setter Property="Fill" Value="#555555" />
<Setter Property="Width" Value="32" />
<Setter Property="Height" Value="32" />
<Setter Property="Opacity" Value="0.2" />
</Style>
<Style
x:Key="ClockBox"
BasedOn="{StaticResource BaseClockBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#818181" />
</Style>
<Style
x:Key="DateBox"
BasedOn="{StaticResource BaseDateBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#818181" />
</Style>
<Style
x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}"
TargetType="{x:Type Border}">
<Setter Property="BorderBrush" Value="#c6c6c6" />
</Style>
<Style
x:Key="PreviewItemTitleStyle"
BasedOn="{StaticResource BasePreviewItemTitleStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#000000" />
</Style>
<Style
x:Key="PreviewItemSubTitleStyle"
BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#818181" />
</Style>
<Style
x:Key="PreviewGlyph"
BasedOn="{StaticResource BasePreviewGlyph}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#000000" />
</Style>
</ResourceDictionary>

34
Flow.Launcher/Themes/Win11System.xaml → Flow.Launcher/Themes/Win10System.xaml
View file

@ -1,3 +1,8 @@
<!--
Name: Windows 10
IsDark: True
HasBlur: False
-->
<ResourceDictionary <ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@ -24,21 +29,19 @@
BasedOn="{StaticResource BaseQueryBoxStyle}" BasedOn="{StaticResource BaseQueryBoxStyle}"
TargetType="{x:Type TextBox}"> TargetType="{x:Type TextBox}">
<Setter Property="SelectionBrush" Value="{DynamicResource QuerySelectionBrush}" /> <Setter Property="SelectionBrush" Value="{DynamicResource QuerySelectionBrush}" />
<Setter Property="FontSize" Value="24" /> <Setter Property="FontSize" Value="22" />
<Setter Property="Foreground" Value="{DynamicResource Color05B}" /> <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
<Setter Property="CaretBrush" Value="{DynamicResource Color05B}" /> <Setter Property="CaretBrush" Value="{DynamicResource Color05B}" />
<Setter Property="FontSize" Value="26" /> <Setter Property="Padding" Value="0 4 66 0" />
<Setter Property="Padding" Value="0,4,66,0" />
<Setter Property="Height" Value="42" /> <Setter Property="Height" Value="42" />
</Style> </Style>
<Style <Style
x:Key="QuerySuggestionBoxStyle" x:Key="QuerySuggestionBoxStyle"
BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
TargetType="{x:Type TextBox}"> TargetType="{x:Type TextBox}">
<Setter Property="Background" Value="{DynamicResource Color01B}" />
<Setter Property="Foreground" Value="{DynamicResource QuerySuggestionBoxForeground}" /> <Setter Property="Foreground" Value="{DynamicResource QuerySuggestionBoxForeground}" />
<Setter Property="FontSize" Value="26" /> <Setter Property="FontSize" Value="22" />
<Setter Property="Padding" Value="0,4,66,0" /> <Setter Property="Padding" Value="0 4 66 0" />
<Setter Property="Height" Value="42" /> <Setter Property="Height" Value="42" />
</Style> </Style>
<Style <Style
@ -55,7 +58,6 @@
BasedOn="{StaticResource BaseWindowStyle}" BasedOn="{StaticResource BaseWindowStyle}"
TargetType="{x:Type Window}"> TargetType="{x:Type Window}">
<Setter Property="Width" Value="576" /> <Setter Property="Width" Value="576" />
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
</Style> </Style>
<Style <Style
@ -105,7 +107,7 @@
<Setter Property="Cursor" Value="Arrow" /> <Setter Property="Cursor" Value="Arrow" />
</Style> </Style>
<Style x:Key="HighlightStyle"> <Style x:Key="HighlightStyle">
<Setter Property="Inline.Foreground" Value="{DynamicResource InlineHighlight}" /> <Setter Property="Inline.FontWeight" Value="SemiBold" />
</Style> </Style>
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}"> <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="13" /> <Setter Property="FontSize" Value="13" />
@ -151,28 +153,35 @@
TargetType="{x:Type Rectangle}"> TargetType="{x:Type Rectangle}">
<Setter Property="Fill" Value="{DynamicResource SeparatorForeground}" /> <Setter Property="Fill" Value="{DynamicResource SeparatorForeground}" />
<Setter Property="Height" Value="1" /> <Setter Property="Height" Value="1" />
<Setter Property="Margin" Value="12,0,12,8" /> <Setter Property="Margin" Value="12 0 12 8" />
</Style> </Style>
<Style <Style
x:Key="SearchIconStyle" x:Key="SearchIconStyle"
BasedOn="{StaticResource BaseSearchIconStyle}" BasedOn="{StaticResource BaseSearchIconStyle}"
TargetType="{x:Type Path}"> TargetType="{x:Type Path}">
<Setter Property="Fill" Value="{DynamicResource SearchIconForeground}" /> <Setter Property="Fill" Value="{DynamicResource SearchIconForeground}" />
<Setter Property="Width" Value="30" />
<Setter Property="Height" Value="30" />
<Setter Property="Opacity" Value="1" />
</Style>
<Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
<Setter Property="Width" Value="32" /> <Setter Property="Width" Value="32" />
<Setter Property="Height" Value="32" /> <Setter Property="Height" Value="32" />
<Setter Property="Opacity" Value="1" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="Margin" Value="0 0 16 0" />
<Setter Property="HorizontalAlignment" Value="Right" />
</Style> </Style>
<Style <Style
x:Key="ClockBox" x:Key="ClockBox"
BasedOn="{StaticResource BaseClockBox}" BasedOn="{StaticResource BaseClockBox}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="{DynamicResource HotkeyForeground}" /> <Setter Property="Foreground" Value="{DynamicResource ClockDateForeground}" />
</Style> </Style>
<Style <Style
x:Key="DateBox" x:Key="DateBox"
BasedOn="{StaticResource BaseDateBox}" BasedOn="{StaticResource BaseDateBox}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="{DynamicResource HotkeyForeground}" /> <Setter Property="Foreground" Value="{DynamicResource ClockDateForeground}" />
</Style> </Style>
<Style <Style
x:Key="PreviewBorderStyle" x:Key="PreviewBorderStyle"
@ -190,7 +199,6 @@
x:Key="PreviewItemSubTitleStyle" x:Key="PreviewItemSubTitleStyle"
BasedOn="{StaticResource BasePreviewItemSubTitleStyle}" BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#818181" />
<Setter Property="Foreground" Value="{DynamicResource SubTitleForeground}" /> <Setter Property="Foreground" Value="{DynamicResource SubTitleForeground}" />
<Setter Property="FontSize" Value="13" /> <Setter Property="FontSize" Value="13" />
</Style> </Style>

195
Flow.Launcher/Themes/Win11Dark.xaml
View file

@ -1,195 +0,0 @@
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=mscorlib">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
</ResourceDictionary.MergedDictionaries>
<Thickness x:Key="ResultMargin">0 0 0 8</Thickness>
<Style
x:Key="ItemGlyph"
BasedOn="{StaticResource BaseGlyphStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#ffffff" />
</Style>
<Style
x:Key="QueryBoxStyle"
BasedOn="{StaticResource BaseQueryBoxStyle}"
TargetType="{x:Type TextBox}">
<Setter Property="SelectionBrush" Value="#4a5459" />
<Setter Property="FontSize" Value="24" />
<Setter Property="Foreground" Value="#FFFFFF" />
<Setter Property="CaretBrush" Value="#FFFFFF" />
<Setter Property="FontSize" Value="26" />
<Setter Property="Padding" Value="0,4,66,0" />
<Setter Property="Height" Value="42" />
</Style>
<Style
x:Key="QuerySuggestionBoxStyle"
BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
TargetType="{x:Type TextBox}">
<Setter Property="Background" Value="#202020" />
<Setter Property="Foreground" Value="#7b7b7b" />
<Setter Property="FontSize" Value="26" />
<Setter Property="Padding" Value="0,4,66,0" />
<Setter Property="Height" Value="42" />
</Style>
<Style
x:Key="WindowBorderStyle"
BasedOn="{StaticResource BaseWindowBorderStyle}"
TargetType="{x:Type Border}">
<Setter Property="BorderThickness" Value="1" />
<Setter Property="BorderBrush" Value="#3f3f3f" />
<Setter Property="CornerRadius" Value="5" />
<Setter Property="Background" Value="#202020" />
</Style>
<Style
x:Key="WindowStyle"
BasedOn="{StaticResource BaseWindowStyle}"
TargetType="{x:Type Window}">
<Setter Property="Width" Value="576" />
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
</Style>
<Style
x:Key="PendingLineStyle"
BasedOn="{StaticResource BasePendingLineStyle}"
TargetType="{x:Type Line}">
<Setter Property="Stroke" Value="White" />
</Style>
<!-- Item Style -->
<Style
x:Key="ItemTitleStyle"
BasedOn="{StaticResource BaseItemTitleStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#ffffff" />
</Style>
<Style
x:Key="ItemSubTitleStyle"
BasedOn="{StaticResource BaseItemSubTitleStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#7b7b7b" />
<Setter Property="FontSize" Value="13" />
<Setter Property="FontWeight" Value="Regular" />
</Style>
<Style
x:Key="ItemNumberStyle"
BasedOn="{StaticResource BaseItemNumberStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#ffffff" />
</Style>
<Style
x:Key="ItemTitleSelectedStyle"
BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Cursor" Value="Arrow" />
<Setter Property="Foreground" Value="#ffffff" />
</Style>
<Style
x:Key="ItemSubTitleSelectedStyle"
BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Cursor" Value="Arrow" />
<Setter Property="Foreground" Value="#7b7b7b" />
<Setter Property="FontSize" Value="13" />
<Setter Property="FontWeight" Value="Regular" />
</Style>
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#198F8F8F</SolidColorBrush>
<Style
x:Key="ItemImageSelectedStyle"
BasedOn="{StaticResource BaseItemImageSelectedStyle}"
TargetType="{x:Type Image}">
<Setter Property="Cursor" Value="Arrow" />
</Style>
<Style x:Key="HighlightStyle">
<Setter Property="Inline.Foreground" Value="#0078d7" />
</Style>
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="13" />
<Setter Property="Foreground" Value="#7b7b7b" />
</Style>
<Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="13" />
<Setter Property="Foreground" Value="#7b7b7b" />
</Style>
<!-- button style in the middle of the scrollbar -->
<Style
x:Key="ThumbStyle"
BasedOn="{StaticResource BaseThumbStyle}"
TargetType="{x:Type Thumb}">
<Setter Property="SnapsToDevicePixels" Value="True" />
<Setter Property="OverridesDefaultStyle" Value="true" />
<Setter Property="IsTabStop" Value="false" />
<Setter Property="Width" Value="2" />
<Setter Property="Focusable" Value="false" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Thumb}">
<Border
Background="#9a9a9a"
BorderBrush="Transparent"
BorderThickness="0"
CornerRadius="2"
DockPanel.Dock="Right" />
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style
x:Key="ScrollBarStyle"
BasedOn="{StaticResource BaseScrollBarStyle}"
TargetType="{x:Type ScrollBar}" />
<Style
x:Key="SeparatorStyle"
BasedOn="{StaticResource BaseSeparatorStyle}"
TargetType="{x:Type Rectangle}">
<Setter Property="Fill" Value="#4d4d4d" />
<Setter Property="Height" Value="1" />
<Setter Property="Margin" Value="12,0,12,8" />
</Style>
<Style
x:Key="SearchIconStyle"
BasedOn="{StaticResource BaseSearchIconStyle}"
TargetType="{x:Type Path}">
<Setter Property="Fill" Value="#4d4d4d" />
<Setter Property="Width" Value="32" />
<Setter Property="Height" Value="32" />
</Style>
<Style
x:Key="ClockBox"
BasedOn="{StaticResource BaseClockBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#7b7b7b" />
</Style>
<Style
x:Key="DateBox"
BasedOn="{StaticResource BaseDateBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#7b7b7b" />
</Style>
<Style
x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}"
TargetType="{x:Type Border}">
<Setter Property="BorderBrush" Value="#4d4d4d" />
</Style>
<Style
x:Key="PreviewItemTitleStyle"
BasedOn="{StaticResource BasePreviewItemTitleStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#ffffff" />
</Style>
<Style
x:Key="PreviewItemSubTitleStyle"
BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#7b7b7b" />
</Style>
<Style
x:Key="PreviewGlyph"
BasedOn="{StaticResource BasePreviewGlyph}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#ffffff" />
</Style>
</ResourceDictionary>

185
Flow.Launcher/Themes/Win11Light.xaml
View file

@ -1,72 +1,77 @@
<!--
Name: Windows 11
IsDark: True
HasBlur: False
-->
<ResourceDictionary <ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:m="http://schemas.modernwpf.com/2019"
xmlns:system="clr-namespace:System;assembly=mscorlib"> xmlns:system="clr-namespace:System;assembly=mscorlib">
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" /> <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<Thickness x:Key="ResultMargin">0 0 0 8</Thickness> <Style
x:Key="BulletStyle"
BasedOn="{StaticResource BaseBulletStyle}"
TargetType="{x:Type Border}">
<Setter Property="Width" Value="4" />
<Setter Property="Height" Value="38" />
<Setter Property="Background" Value="Transparent" />
</Style>
<Style
x:Key="ItemBulletSelectedStyle"
BasedOn="{StaticResource BaseBulletStyle}"
TargetType="{x:Type Border}">
<Setter Property="Width" Value="4" />
<Setter Property="Height" Value="38" />
<Setter Property="CornerRadius" Value="2" />
<Setter Property="Background" Value="{StaticResource SystemAccentColorLight1Brush}" />
</Style>
<Style <Style
x:Key="ItemGlyph" x:Key="ItemGlyph"
BasedOn="{StaticResource BaseGlyphStyle}" BasedOn="{StaticResource BaseGlyphStyle}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#000000" /> <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
</Style> <Setter Property="Margin" Value="-4 0 0 0" />
<Style
x:Key="ItemGlyphSelectedStyle"
BasedOn="{StaticResource BaseGlyphStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#000000" />
</Style> </Style>
<Style <Style
x:Key="QueryBoxStyle" x:Key="QueryBoxStyle"
BasedOn="{StaticResource BaseQueryBoxStyle}" BasedOn="{StaticResource BaseQueryBoxStyle}"
TargetType="{x:Type TextBox}"> TargetType="{x:Type TextBox}">
<Setter Property="SelectionBrush" Value="#0a68d8" /> <Setter Property="Padding" Value="0 0 50 0" />
<Setter Property="FontSize" Value="24" /> <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
<Setter Property="Background" Value="Transparent" /> <Setter Property="CaretBrush" Value="{DynamicResource Color05B}" />
<Setter Property="Foreground" Value="#000000" /> <Setter Property="SelectionBrush" Value="{StaticResource SystemAccentColorLight1Brush}" />
<Setter Property="CaretBrush" Value="#000000" /> <Setter Property="FontSize" Value="18" />
<Setter Property="FontSize" Value="26" />
<Setter Property="Padding" Value="0,4,66,0" />
<Setter Property="Height" Value="42" /> <Setter Property="Height" Value="42" />
</Style> </Style>
<Style <Style
x:Key="QuerySuggestionBoxStyle" x:Key="QuerySuggestionBoxStyle"
BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
TargetType="{x:Type TextBox}"> TargetType="{x:Type TextBox}">
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="Foreground" Value="#b5b5b5" /> <Setter Property="Padding" Value="0 0 50 0" />
<Setter Property="FontSize" Value="26" />
<Setter Property="Padding" Value="0,4,66,0" />
<Setter Property="Height" Value="42" /> <Setter Property="Height" Value="42" />
<Setter Property="FontSize" Value="18" />
<Setter Property="Foreground" Value="{DynamicResource QuerySuggestionBoxForeground}" />
</Style> </Style>
<Style <Style
x:Key="WindowBorderStyle" x:Key="WindowBorderStyle"
BasedOn="{StaticResource BaseWindowBorderStyle}" BasedOn="{StaticResource BaseWindowBorderStyle}"
TargetType="{x:Type Border}"> TargetType="{x:Type Border}">
<Setter Property="BorderThickness" Value="1" /> <Setter Property="BorderThickness" Value="1" />
<Setter Property="BorderBrush" Value="#aaaaaa" /> <Setter Property="BorderBrush" Value="{DynamicResource SystemThemeBorder}" />
<Setter Property="CornerRadius" Value="5" /> <Setter Property="Background" Value="{DynamicResource Color01B}" />
<Setter Property="Background"> <Setter Property="UseLayoutRounding" Value="True" />
<Setter.Value>
<LinearGradientBrush StartPoint="0,0.5" EndPoint="1,0.5">
<GradientStop Offset="0" Color="#f4f1f8" />
<GradientStop Offset="0.8" Color="#f9f2e8" />
<GradientStop Offset="1" Color="#f9f0f3" />
</LinearGradientBrush>
</Setter.Value>
</Setter>
</Style> </Style>
<Style <Style
x:Key="WindowStyle" x:Key="WindowStyle"
BasedOn="{StaticResource BaseWindowStyle}" BasedOn="{StaticResource BaseWindowStyle}"
TargetType="{x:Type Window}"> TargetType="{x:Type Window}" />
<Setter Property="Width" Value="576" />
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
</Style>
<Style <Style
x:Key="PendingLineStyle" x:Key="PendingLineStyle"
BasedOn="{StaticResource BasePendingLineStyle}" BasedOn="{StaticResource BasePendingLineStyle}"
@ -77,69 +82,47 @@
x:Key="ItemTitleStyle" x:Key="ItemTitleStyle"
BasedOn="{StaticResource BaseItemTitleStyle}" BasedOn="{StaticResource BaseItemTitleStyle}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#000000" /> <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
</Style> </Style>
<Style <Style
x:Key="ItemSubTitleStyle" x:Key="ItemSubTitleStyle"
BasedOn="{StaticResource BaseItemSubTitleStyle}" BasedOn="{StaticResource BaseItemSubTitleStyle}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#818181" /> <Setter Property="Foreground" Value="{DynamicResource SubTitleForeground}" />
<Setter Property="FontSize" Value="13" />
</Style> </Style>
<Style <Style
x:Key="ItemNumberStyle" x:Key="SeparatorStyle"
BasedOn="{StaticResource BaseItemNumberStyle}" BasedOn="{StaticResource BaseSeparatorStyle}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type Rectangle}">
<Setter Property="Foreground" Value="#A6A6A6" /> <Setter Property="Fill" Value="{DynamicResource SeparatorForeground}" />
<Setter Property="Height" Value="1" />
<Setter Property="Margin" Value="0 0 0 0" />
</Style> </Style>
<Style x:Key="HighlightStyle" />
<Style <Style
x:Key="ItemTitleSelectedStyle" x:Key="ItemTitleSelectedStyle"
BasedOn="{StaticResource BaseItemTitleSelectedStyle}" BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#000000" /> <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
</Style> </Style>
<Style <Style
x:Key="ItemSubTitleSelectedStyle" x:Key="ItemSubTitleSelectedStyle"
BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#72767d" /> <Setter Property="Foreground" Value="{DynamicResource SubTitleSelectedForeground}" />
</Style>
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#198F8F8F</SolidColorBrush>
<Style
x:Key="ItemImageSelectedStyle"
BasedOn="{StaticResource BaseItemImageSelectedStyle}"
TargetType="{x:Type Image}">
<Setter Property="Cursor" Value="Arrow" />
</Style>
<Style x:Key="HighlightStyle">
<Setter Property="Inline.Foreground" Value="#0078d7" />
</Style>
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="13" />
<Setter Property="Foreground" Value="#acacac" />
</Style>
<Style
x:Key="ItemHotkeySelectedStyle"
BasedOn="{StaticResource BaseItemHotkeySelectedStyle}"
TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="13" />
<Setter Property="Foreground" Value="#acacac" />
</Style> </Style>
<SolidColorBrush x:Key="ItemSelectedBackgroundColor" Color="{m:DynamicColor ItemSelectedBackgroundColorBrush}" />
<!-- button style in the middle of the scrollbar --> <!-- button style in the middle of the scrollbar -->
<Style <Style
x:Key="ThumbStyle" x:Key="ThumbStyle"
BasedOn="{StaticResource BaseThumbStyle}" BasedOn="{StaticResource BaseThumbStyle}"
TargetType="{x:Type Thumb}"> TargetType="{x:Type Thumb}">
<Setter Property="SnapsToDevicePixels" Value="True" />
<Setter Property="OverridesDefaultStyle" Value="true" />
<Setter Property="IsTabStop" Value="false" />
<Setter Property="Width" Value="2" />
<Setter Property="Focusable" Value="false" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type Thumb}"> <ControlTemplate TargetType="{x:Type Thumb}">
<Border <Border
Background="#868686" Background="{DynamicResource ThumbColor}"
BorderBrush="Transparent" BorderBrush="Transparent"
BorderThickness="0" BorderThickness="0"
CornerRadius="2" CornerRadius="2"
@ -152,58 +135,84 @@
x:Key="ScrollBarStyle" x:Key="ScrollBarStyle"
BasedOn="{StaticResource BaseScrollBarStyle}" BasedOn="{StaticResource BaseScrollBarStyle}"
TargetType="{x:Type ScrollBar}" /> TargetType="{x:Type ScrollBar}" />
<Style
x:Key="SeparatorStyle"
BasedOn="{StaticResource BaseSeparatorStyle}"
TargetType="{x:Type Rectangle}">
<Setter Property="Fill" Value="#eaeaea" />
<Setter Property="Height" Value="1" />
<Setter Property="Margin" Value="12,0,12,8" />
</Style>
<Style <Style
x:Key="SearchIconStyle" x:Key="SearchIconStyle"
BasedOn="{StaticResource BaseSearchIconStyle}" BasedOn="{StaticResource BaseSearchIconStyle}"
TargetType="{x:Type Path}"> TargetType="{x:Type Path}">
<Setter Property="Fill" Value="#555555" /> <Setter Property="Fill" Value="{DynamicResource SearchIconForeground}" />
<Setter Property="Width" Value="24" />
<Setter Property="Height" Value="24" />
</Style>
<Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
<Setter Property="Background" Value="Transparent" />
<Setter Property="Width" Value="32" /> <Setter Property="Width" Value="32" />
<Setter Property="Height" Value="32" /> <Setter Property="Height" Value="32" />
<Setter Property="Opacity" Value="0.2" /> <Setter Property="Margin" Value="0 8 8 0" />
<Setter Property="HorizontalAlignment" Value="Right" />
</Style>
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="12" />
<Setter Property="Foreground" Value="{DynamicResource HotkeyForeground}" />
</Style>
<Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="12" />
<Setter Property="Foreground" Value="{DynamicResource HotkeySelectedForeground}" />
</Style>
<Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="{DynamicResource Color05B}" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="Margin" Value="-4 0 0 0" />
<Setter Property="Width" Value="25" />
<Setter Property="Height" Value="25" />
<Setter Property="FontSize" Value="25" />
</Style>
<CornerRadius x:Key="ItemRadius">5</CornerRadius>
<Thickness x:Key="ItemMargin">10 0 5 0</Thickness>
<Thickness x:Key="ResultMargin">0 10 0 10</Thickness>
<Style
x:Key="ClockPanel"
BasedOn="{StaticResource ClockPanel}"
TargetType="{x:Type StackPanel}">
<Setter Property="Margin" Value="0 0 54 0" />
</Style> </Style>
<Style <Style
x:Key="ClockBox" x:Key="ClockBox"
BasedOn="{StaticResource BaseClockBox}" BasedOn="{StaticResource BaseClockBox}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#acacac" /> <Setter Property="Foreground" Value="{DynamicResource ClockDateForeground}" />
<Setter Property="FontSize" Value="22" />
</Style> </Style>
<Style <Style
x:Key="DateBox" x:Key="DateBox"
BasedOn="{StaticResource BaseDateBox}" BasedOn="{StaticResource BaseDateBox}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#acacac" /> <Setter Property="Foreground" Value="{DynamicResource ClockDateForeground}" />
</Style> </Style>
<Style <Style
x:Key="PreviewBorderStyle" x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}" BasedOn="{StaticResource BasePreviewBorderStyle}"
TargetType="{x:Type Border}"> TargetType="{x:Type Border}">
<Setter Property="BorderBrush" Value="#eaeaea" /> <Setter Property="BorderBrush" Value="{DynamicResource SeparatorForeground}" />
<Setter Property="Margin" Value="5 0 10 0" />
</Style> </Style>
<Style <Style
x:Key="PreviewItemTitleStyle" x:Key="PreviewItemTitleStyle"
BasedOn="{StaticResource BasePreviewItemTitleStyle}" BasedOn="{StaticResource BasePreviewItemTitleStyle}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#000000" /> <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
</Style> </Style>
<Style <Style
x:Key="PreviewItemSubTitleStyle" x:Key="PreviewItemSubTitleStyle"
BasedOn="{StaticResource BasePreviewItemSubTitleStyle}" BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#818181" /> <Setter Property="Foreground" Value="{DynamicResource SubTitleForeground}" />
</Style> </Style>
<Style <Style
x:Key="PreviewGlyph" x:Key="PreviewGlyph"
BasedOn="{StaticResource BasePreviewGlyph}" BasedOn="{StaticResource BasePreviewGlyph}"
TargetType="{x:Type TextBlock}"> TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#000000" /> <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
</Style> </Style>
</ResourceDictionary> </ResourceDictionary>

26
Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml
View file

@ -10,7 +10,7 @@
mc:Ignorable="d"> mc:Ignorable="d">
<Grid <Grid
x:Name="PreviewGrid" x:Name="PreviewGrid"
Margin="20 0 10 0" Margin="0 0 0 0"
VerticalAlignment="Stretch"> VerticalAlignment="Stretch">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition /> <RowDefinition />
@ -23,7 +23,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Image <Image
Grid.Row="0" Grid.Row="0"
Margin="0 12 0 0" Margin="5 12 8 0"
Source="{Binding PreviewImage, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"> Source="{Binding PreviewImage, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}">
<Image.Style> <Image.Style>
<Style TargetType="Image"> <Style TargetType="Image">
@ -38,7 +38,7 @@
</Image> </Image>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<TextBlock <TextBlock
Margin="0 6 0 16" Margin="5 6 5 16"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Top" VerticalAlignment="Top"
Style="{DynamicResource PreviewItemTitleStyle}" Style="{DynamicResource PreviewItemTitleStyle}"
@ -59,16 +59,18 @@
</StackPanel.Style> </StackPanel.Style>
<Rectangle <Rectangle
Width="Auto" Width="Auto"
Margin="0 0 0 0" Height="1"
Margin="0 0 5 0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Style="{DynamicResource SeparatorStyle}" /> Style="{DynamicResource SeparatorStyle}" />
<TextBlock <TextBlock
Margin="0 8 0 8" Margin="5 8 8 8"
Style="{DynamicResource PreviewItemSubTitleStyle}" Style="{DynamicResource PreviewItemSubTitleStyle}"
Text="{Binding Result.SubTitle}" /> Text="{Binding Result.SubTitle}" />
<Rectangle <Rectangle
Width="Auto" Width="Auto"
Margin="0 0 0 0" Height="1"
Margin="0 0 5 0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Style="{DynamicResource SeparatorStyle}" /> Style="{DynamicResource SeparatorStyle}" />
<StackPanel Visibility="{Binding FileInfoVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"> <StackPanel Visibility="{Binding FileInfoVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}">
@ -86,7 +88,7 @@
<TextBlock <TextBlock
Grid.Row="0" Grid.Row="0"
Grid.Column="0" Grid.Column="0"
Margin="0 0 0 0" Margin="5 0 0 0"
VerticalAlignment="Top" VerticalAlignment="Top"
Style="{DynamicResource PreviewItemSubTitleStyle}" Style="{DynamicResource PreviewItemSubTitleStyle}"
Text="{DynamicResource FileSize}" Text="{DynamicResource FileSize}"
@ -95,7 +97,7 @@
<TextBlock <TextBlock
Grid.Row="0" Grid.Row="0"
Grid.Column="1" Grid.Column="1"
Margin="0" Margin="0 0 13 0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Top" VerticalAlignment="Top"
Style="{DynamicResource PreviewItemSubTitleStyle}" Style="{DynamicResource PreviewItemSubTitleStyle}"
@ -106,7 +108,7 @@
<TextBlock <TextBlock
Grid.Row="1" Grid.Row="1"
Grid.Column="0" Grid.Column="0"
Margin="0 0 8 0" Margin="5 0 8 0"
VerticalAlignment="Top" VerticalAlignment="Top"
Style="{DynamicResource PreviewItemSubTitleStyle}" Style="{DynamicResource PreviewItemSubTitleStyle}"
Text="{DynamicResource Created}" Text="{DynamicResource Created}"
@ -115,7 +117,7 @@
<TextBlock <TextBlock
Grid.Row="1" Grid.Row="1"
Grid.Column="1" Grid.Column="1"
Margin="0" Margin="0 0 13 0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Top" VerticalAlignment="Top"
Style="{DynamicResource PreviewItemSubTitleStyle}" Style="{DynamicResource PreviewItemSubTitleStyle}"
@ -126,7 +128,7 @@
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="2"
Grid.Column="0" Grid.Column="0"
Margin="0 0 8 0" Margin="5 0 8 0"
VerticalAlignment="Top" VerticalAlignment="Top"
Style="{DynamicResource PreviewItemSubTitleStyle}" Style="{DynamicResource PreviewItemSubTitleStyle}"
Text="{DynamicResource LastModified}" Text="{DynamicResource LastModified}"
@ -135,7 +137,7 @@
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="2"
Grid.Column="1" Grid.Column="1"
Margin="0" Margin="0 0 13 0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Top" VerticalAlignment="Top"
Style="{DynamicResource PreviewItemSubTitleStyle}" Style="{DynamicResource PreviewItemSubTitleStyle}"