Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
3a0594f
- Changing Result item and hotkey layout
onesounds Sep 27, 2021
0c47557
Add Modern Theme
onesounds Sep 27, 2021
b07a437
delete margin
onesounds Sep 27, 2021
7789c1c
adjust padding
onesounds Sep 27, 2021
c6f1a00
adjust
onesounds Sep 27, 2021
53c04fd
Fix Separator
onesounds Sep 27, 2021
f07a009
- Add Textbox Caret Color
onesounds Sep 27, 2021
4ced995
- Delete Comment
onesounds Sep 27, 2021
f83212a
remove itemgroup in csproj.
onesounds Sep 27, 2021
c227ba3
- fix for build (recovery some item group)
onesounds Sep 27, 2021
3bc3563
- Rollback Classic Skins
onesounds Sep 28, 2021
46917ea
but default hotkey color is not same subtitle color in classicthemes …
onesounds Sep 28, 2021
3e25030
Merge branch 'ModernTheme' of https://github.com/onesounds/Flow.Launc…
onesounds Sep 28, 2021
91d21a7
- Search Ico- In the theme, search icons can be inserted and styled (…
onesounds Sep 28, 2021
505b4cb
fix win11light theme seperator margin
onesounds Sep 28, 2021
8eba28f
- fix the theme preview in setting window
onesounds Sep 28, 2021
f1bfa5c
Fix Selected color in Darker.theme
onesounds Sep 30, 2021
9d10b7f
Fix the White Querybox in Metro Server.theme
onesounds Sep 30, 2021
bb7b0cd
- Add Magnifier in Win 11 Light/Dark Theme
onesounds Sep 30, 2021
ecb0cac
- Add listbox clipping class for rounded corner theme.
onesounds Oct 1, 2021
6a58576
- clean code
onesounds Oct 1, 2021
136f227
- Fix Responsive Query Area
onesounds Oct 1, 2021
c89d277
- Fix Responsive Query Area
onesounds Oct 1, 2021
49f00f5
- Fix List Item Margin
onesounds Oct 1, 2021
8e93969
- Fix pink theme (querybox witdh)
onesounds Oct 1, 2021
6048de4
- Fix Querybox Width
onesounds Oct 1, 2021
6211275
- Fix Setting window preview (last item clip)
onesounds Oct 1, 2021
c32ae79
Merge branch 'ModernTheme' of https://github.com/onesounds/Flow.Launc…
onesounds Oct 1, 2021
2b7855c
Change default Scrollbar Thumb color
onesounds Oct 1, 2021
39b53d9
Change default Scrollbar Thumb color
onesounds Oct 1, 2021
2144577
- Adjust Theme Preivew in setting window
onesounds Oct 1, 2021
03d134d
Add sublime theme
onesounds Oct 1, 2021
6e047e0
Fix Icon Image little cut #710
onesounds Oct 1, 2021
e7b4dd1
- Add ItemHotkeySelectedStyle Property
onesounds Oct 2, 2021
df3c5bf
- Add ItemHotkeySelectedStyle Property
onesounds Oct 2, 2021
89f4f5d
Fix Win11Light font size
onesounds Oct 2, 2021
1621f34
Fix Win11Light font size
onesounds Oct 2, 2021
92f0041
Merge branch 'ModernTheme' of https://github.com/onesounds/Flow.Launc…
onesounds Oct 2, 2021
c1b0929
- Redesign Setting Window
onesounds Oct 3, 2021
832405a
- Adjust base.xaml to match original(1.8) size for classic themes
onesounds Oct 4, 2021
1c96f04
- Adjust base.xaml to match original(1.8) size for classic themes
onesounds Oct 4, 2021
ca179be
- Adjust Plugin Tab in setting window
onesounds Oct 4, 2021
ed5bd5b
Merge branch 'ModernTheme' of https://github.com/onesounds/Flow.Launc…
onesounds Oct 4, 2021
4e01019
Merge branch 'ModernTheme' of https://github.com/onesounds/Flow.Launc…
onesounds Oct 4, 2021
d084793
Merge branch 'ModernTheme' of https://github.com/onesounds/Flow.Launc…
onesounds Oct 4, 2021
e201df9
- Fix Dropshadow
onesounds Oct 4, 2021
6c43a48
- Add Left/Right Key for context menu.
onesounds Oct 4, 2021
a5534ca
Update Flow.Launcher/Converters/BorderClipConverter.cs
onesounds Oct 5, 2021
d1e7b4e
Update Flow.Launcher/Flow.Launcher.csproj
onesounds Oct 5, 2021
1948ec5
Update Flow.Launcher/Flow.Launcher.csproj
onesounds Oct 5, 2021
88a9767
- delete csproj
onesounds Oct 5, 2021
10accd5
- Change value progress bar (using actual window)
onesounds Oct 5, 2021
d902a1e
use switch statement for Left/Right context menu logic
jjw24 Oct 5, 2021
e14bb23
- Merge "use switch statement for Left/Right context menu logic"
onesounds Oct 5, 2021
1b1a81d
- Rollback progressbar
onesounds Oct 5, 2021
12f95d1
- Fix Sperator(if it has) is not visible in the context menu or history.
onesounds Oct 5, 2021
25b5f30
- Add automatically height for subtitle.
onesounds Oct 5, 2021
8aaeb85
- item of *.lnk remove subtitle (for test)
onesounds Oct 5, 2021
66e722b
- Change context icon to glyph in some plugin
onesounds Oct 6, 2021
1149ff5
- Add Close Context menu in main window query bar
onesounds Oct 6, 2021
c74a2db
- Add clock in query bar (sublime theme only)
onesounds Oct 6, 2021
763cab8
Revert "- Add clock in query bar (sublime theme only)"
onesounds Oct 6, 2021
54145d7
revert subtitle change
jjw24 Oct 6, 2021
5f0df98
adjust Program plugin width
jjw24 Oct 6, 2021
04a10ed
add glyph option to settings
jjw24 Oct 7, 2021
4f19355
update wording
jjw24 Oct 7, 2021
1d746c2
- Fix ProgressBar (Finally!)
onesounds Oct 7, 2021
42dda34
add ItemHotkeyStyle key into dictionary
jjw24 Oct 8, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Flow.Launcher/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,10 @@
</ContextMenu>
</TextBox.ContextMenu>
</TextBox>
<svgc:SvgControl Source="{Binding Image}" HorizontalAlignment="Right" Width="25" Height="25" Margin="0,2,18,0" Opacity="0.2" Background="Transparent" Style="{DynamicResource SearchIconStyle}"/>
<Canvas Style="{DynamicResource SearchIconPosition}">
<Path Data="{DynamicResource SearchIconImg}" Style="{DynamicResource SearchIconStyle}" Margin="0" Stretch="Fill"/>
</Canvas>

</Grid>


Expand Down
20 changes: 18 additions & 2 deletions Flow.Launcher/Themes/Base.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -194,11 +194,27 @@
</Style>
<Style x:Key="HighlightStyle">
<Setter Property="Inline.FontWeight" Value="Bold" />
</Style>
</Style>
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="15" />
<Setter Property="Foreground" Value="#8f8f8f" />
<Setter Property="Opacity" Value="0.5" />
</Style>
</Style>

<Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
<Setter Property="Width" Value="32" />
<Setter Property="Height" Value="32" />
<Setter Property="Margin" Value="0 2 18 0" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="HorizontalAlignment" Value="Right" />
</Style>

<Geometry x:Key="SearchIconImg">F1 M12000,12000z M0,0z M10354,10962C10326,10951 10279,10927 10249,10907 10216,10886 9476,10153 8370,9046 7366,8042 6541,7220 6536,7220 6532,7220 6498,7242 6461,7268 6213,7447 5883,7619 5592,7721 5194,7860 4802,7919 4360,7906 3612,7886 2953,7647 2340,7174 2131,7013 1832,6699 1664,6465 1394,6088 1188,5618 1097,5170 1044,4909 1030,4764 1030,4470 1030,4130 1056,3914 1135,3609 1263,3110 1511,2633 1850,2235 1936,2134 2162,1911 2260,1829 2781,1395 3422,1120 4090,1045 4271,1025 4667,1025 4848,1045 5505,1120 6100,1368 6630,1789 6774,1903 7081,2215 7186,2355 7362,2588 7467,2759 7579,2990 7802,3455 7911,3937 7911,4460 7911,4854 7861,5165 7737,5542 7684,5702 7675,5724 7602,5885 7517,6071 7390,6292 7270,6460 7242,6499 7220,6533 7220,6538 7220,6542 8046,7371 9055,8380 10441,9766 10898,10229 10924,10274 10945,10308 10966,10364 10976,10408 10990,10472 10991,10493 10980,10554 10952,10717 10840,10865 10690,10937 10621,10971 10607,10974 10510,10977 10425,10980 10395,10977 10354,10962z M4685,7050C5214,7001 5694,6809 6100,6484 6209,6396 6396,6209 6484,6100 7151,5267 7246,4110 6721,3190 6369,2571 5798,2137 5100,1956 4706,1855 4222,1855 3830,1957 3448,2056 3140,2210 2838,2453 2337,2855 2010,3427 1908,4080 1877,4274 1877,4656 1908,4850 1948,5105 2028,5370 2133,5590 2459,6272 3077,6782 3810,6973 3967,7014 4085,7034 4290,7053 4371,7061 4583,7059 4685,7050z</Geometry>

<Style x:Key="SearchIconStyle" TargetType="{x:Type Path}">
<Setter Property="Fill" Value="#555555" />
<Setter Property="Width" Value="32" />
<Setter Property="Height" Value="32" />
</Style>
</ResourceDictionary>

6 changes: 6 additions & 0 deletions Flow.Launcher/Themes/League.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,11 @@
<Setter Property="FontSize" Value="15" />
<Setter Property="Foreground" Value="#5b5a56" />
</Style>
<Geometry x:Key="SearchIconImg">F1 M12000,12000z M0,0z M10354,10962C10326,10951 10279,10927 10249,10907 10216,10886 9476,10153 8370,9046 7366,8042 6541,7220 6536,7220 6532,7220 6498,7242 6461,7268 6213,7447 5883,7619 5592,7721 5194,7860 4802,7919 4360,7906 3612,7886 2953,7647 2340,7174 2131,7013 1832,6699 1664,6465 1394,6088 1188,5618 1097,5170 1044,4909 1030,4764 1030,4470 1030,4130 1056,3914 1135,3609 1263,3110 1511,2633 1850,2235 1936,2134 2162,1911 2260,1829 2781,1395 3422,1120 4090,1045 4271,1025 4667,1025 4848,1045 5505,1120 6100,1368 6630,1789 6774,1903 7081,2215 7186,2355 7362,2588 7467,2759 7579,2990 7802,3455 7911,3937 7911,4460 7911,4854 7861,5165 7737,5542 7684,5702 7675,5724 7602,5885 7517,6071 7390,6292 7270,6460 7242,6499 7220,6533 7220,6538 7220,6542 8046,7371 9055,8380 10441,9766 10898,10229 10924,10274 10945,10308 10966,10364 10976,10408 10990,10472 10991,10493 10980,10554 10952,10717 10840,10865 10690,10937 10621,10971 10607,10974 10510,10977 10425,10980 10395,10977 10354,10962z M4685,7050C5214,7001 5694,6809 6100,6484 6209,6396 6396,6209 6484,6100 7151,5267 7246,4110 6721,3190 6369,2571 5798,2137 5100,1956 4706,1855 4222,1855 3830,1957 3448,2056 3140,2210 2838,2453 2337,2855 2010,3427 1908,4080 1877,4274 1877,4656 1908,4850 1948,5105 2028,5370 2133,5590 2459,6272 3077,6782 3810,6973 3967,7014 4085,7034 4290,7053 4371,7061 4583,7059 4685,7050z</Geometry>
<Style x:Key="SearchIconStyle" TargetType="{x:Type Path}">
<Setter Property="Fill" Value="#b88f3a" />
<Setter Property="Width" Value="32" />
<Setter Property="Height" Value="32" />
</Style>

</ResourceDictionary>
13 changes: 0 additions & 13 deletions Flow.Launcher/Themes/Light.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
<Setter Property="BorderBrush" Value="LightGray" />
<Setter Property="CornerRadius" Value="4" />
<Setter Property="BorderThickness" Value="1"></Setter>
<Setter Property="Background" Value="White"></Setter>
</Style>
Expand Down Expand Up @@ -54,16 +53,4 @@

<Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}">
</Style>
<Style x:Key="HighlightStyle">
<Setter Property="Inline.FontWeight" Value="Bold" />
</Style>
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="14" />
<Setter Property="Foreground" Value="#909090" />
</Style>
<Style x:Key="SeparatorStyle" BasedOn="{StaticResource BaseSeparatorStyle}" TargetType="{x:Type Rectangle}">
<Setter Property="Fill" Value="#c1c1c1"/>
<Setter Property="Height" Value="1"/>
<Setter Property="Margin" Value="0 10 0 0"/>
</Style>
</ResourceDictionary>
60 changes: 30 additions & 30 deletions Flow.Launcher/Themes/Metro Server.xaml
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
<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>
</ResourceDictionary.MergedDictionaries>
<Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
<Setter Property="Background" Value="#ffffff"/>
<Setter Property="Foreground" Value="#000000" />
</Style>
</ResourceDictionary.MergedDictionaries>
<Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this theme(non edited), it works but have design problem. (inputbox full height)

<Setter Property="Background" Value="#ffffff"/>
<Setter Property="Foreground" Value="#000000" />
</Style>

<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
<Setter Property="Background" Value="#ffffff"/>
<Setter Property="Foreground" Value="#000000" />
</Style>
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
<Setter Property="Background" Value="#001e4e"></Setter>
</Style>
<Style x:Key="WindowStyle" TargetType="{x:Type Window}" BasedOn="{StaticResource BaseWindowStyle}" >
</Style>
<Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}" >
</Style>
<Style x:Key="ItemTitleStyle" BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}" >
<Setter Property="Foreground" Value="#f5f5f5"></Setter>
</Style>
<Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}" >
<Setter Property="Foreground" Value="#c2c2c2"></Setter>
</Style>
<Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#f5f5f5" />
</Style>
<Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#c2c2c2" />
</Style>

<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
<Setter Property="Background" Value="#001e4e"></Setter>
</Style>
<Style x:Key="WindowStyle" TargetType="{x:Type Window}" BasedOn="{StaticResource BaseWindowStyle}" >
</Style>
<Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}" >
</Style>
<Style x:Key="ItemTitleStyle" BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}" >
<Setter Property="Foreground" Value="#f5f5f5"></Setter>
</Style>
<Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}" >
<Setter Property="Foreground" Value="#c2c2c2"></Setter>
</Style>
<Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#f5f5f5" />
</Style>
<Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#c2c2c2" />
</Style>
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#006ac1</SolidColorBrush>
<Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
</Style>
<Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}">
</Style>
<Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
</Style>
<Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}">
</Style>
</ResourceDictionary>
25 changes: 24 additions & 1 deletion Flow.Launcher/Themes/Pink.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,29 @@
<Setter Property="Foreground" Value="#c2c2c2" />
</Style>
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#cc1081</SolidColorBrush>
<Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}"></Style>
<Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Thumb}">
<Border CornerRadius="2" DockPanel.Dock="Right" Background="#cc1081" BorderBrush="Transparent" BorderThickness="0" />
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}"></Style>
<Geometry x:Key="SearchIconImg">F1 M20,20z M0,0z M14.75,1A5.24,5.24,0,0,0,10,4A5.24,5.24,0,0,0,0,6.25C0,11.75 10,19 10,19 10,19 20,11.75 20,6.25A5.25,5.25,0,0,0,14.75,1z</Geometry>

<Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
<Setter Property="Width" Value="34" />
<Setter Property="Height" Value="34" />
<Setter Property="Margin" Value="0 6 14 0" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="HorizontalAlignment" Value="Right" />
</Style>
<Style x:Key="SearchIconStyle" TargetType="{x:Type Path}">
<Setter Property="Fill" Value="#cc1081" />
<Setter Property="Width" Value="28" />
<Setter Property="Height" Value="28" />
</Style>

</ResourceDictionary>
52 changes: 28 additions & 24 deletions Flow.Launcher/Themes/Win10Light.xaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
xmlns:system="clr-namespace:System;assembly=mscorlib">

<!-- Further font customisations are dynamically loaded in Theme.cs -->
Expand All @@ -9,7 +10,7 @@
<Setter Property="FontWeight" Value="Regular" />
<Setter Property="Height" Value="56" />
<Setter Property="Background" Value="#2F2F2F" />
<Setter Property="Width" Value="536" />
<Setter Property="Width" Value="536" />
<Setter Property="Foreground" Value="#E3E0E3" />
<Setter Property="CaretBrush" Value="#E3E0E3" />
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I forgot the comment, it's an option to change the color of the textbox cursor.

<Setter Property="VerticalContentAlignment" Value="Center" />
Expand Down Expand Up @@ -85,11 +86,8 @@
<Setter Property="Foreground" Value="#D9D9D4" />
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
</Style>


<Style x:Key="BaseItemImageSelectedStyle" TargetType="{x:Type Image}" >
</Style>

</Style>
<Style x:Key="BaseListboxStyle" TargetType="{x:Type ListBox}">
<Setter Property="BorderBrush" Value="Transparent"/>
<Setter Property="Background" Value="Transparent"/>
Expand All @@ -98,15 +96,13 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ListBox">
<!-- <ScrollViewer Focusable="false" Template="{DynamicResource ScrollViewerControlTemplate}">-->
<ScrollViewer Focusable="false" Template="{DynamicResource ScrollViewerControlTemplate}">
<VirtualizingStackPanel IsItemsHost="True" />
</ScrollViewer>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>

<!-- ScrollViewer Style -->
<ControlTemplate x:Key="ScrollViewerControlTemplate" TargetType="{x:Type ScrollViewer}">
<Grid x:Name="Grid" Background="{TemplateBinding Background}">
Expand Down Expand Up @@ -142,7 +138,6 @@

</Grid>
</ControlTemplate>

<!-- button style in the middle of the scrollbar -->
<Style x:Key="BaseThumbStyle" TargetType="{x:Type Thumb}">
<Setter Property="SnapsToDevicePixels" Value="True"/>
Expand All @@ -157,7 +152,6 @@
</Setter.Value>
</Setter>
</Style>

<Style x:Key="BaseScrollBarStyle" TargetType="{x:Type ScrollBar}">
<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
<Setter Property="Stylus.IsFlicksEnabled" Value="false" />
Expand All @@ -177,23 +171,21 @@
</ControlTemplate>
</Setter.Value>
</Setter>

</Style>


<Style x:Key="BaseSeparatorStyle" TargetType="Rectangle">
<Setter Property="Visibility" Value="Collapsed" />
<Style.Triggers>
<Style x:Key="BaseSeparatorStyle" TargetType="Rectangle">
<Setter Property="Visibility" Value="Collapsed" />
<Style.Triggers>
<DataTrigger Binding="{Binding ElementName=ResultListBox, Path=Visibility}" Value="Visible">
<Setter Property="Visibility" Value="Visible" />
</DataTrigger>
<Setter Property="Visibility" Value="Visible" />
<!-- Top Margin for When Open List, -->
<Setter Property="Margin" Value="0 0 0 8" />
</DataTrigger>
</Style.Triggers>
</Style>

<!-- Edited Base.xaml -->
<!-- Theme Custom -->


<Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
<Setter Property="Background" Value="#dddddd" />
<Setter Property="Foreground" Value="#000000" />
Expand Down Expand Up @@ -254,16 +246,28 @@
<Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}" >
<Setter Property="Width" Value="4"/>
</Style>

<Style x:Key="SeparatorStyle" BasedOn="{StaticResource BaseSeparatorStyle}" TargetType="{x:Type Rectangle}">
<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 0"/>
</Style>

<Setter Property="Height" Value="1"/>
<Setter Property="Margin" Value="12 0 12 0"/>
</Style>
<Style x:Key="HighlightStyle">
<Setter Property="Inline.Foreground" Value="#0078d7" />
</Style>
<Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
<Setter Property="Width" Value="32" />
<Setter Property="Height" Value="32" />
<Setter Property="Margin" Value="0 2 18 0" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="HorizontalAlignment" Value="Right" />
</Style>
<Geometry x:Key="SearchIconImg">F1 M12000,12000z M0,0z M10354,10962C10326,10951 10279,10927 10249,10907 10216,10886 9476,10153 8370,9046 7366,8042 6541,7220 6536,7220 6532,7220 6498,7242 6461,7268 6213,7447 5883,7619 5592,7721 5194,7860 4802,7919 4360,7906 3612,7886 2953,7647 2340,7174 2131,7013 1832,6699 1664,6465 1394,6088 1188,5618 1097,5170 1044,4909 1030,4764 1030,4470 1030,4130 1056,3914 1135,3609 1263,3110 1511,2633 1850,2235 1936,2134 2162,1911 2260,1829 2781,1395 3422,1120 4090,1045 4271,1025 4667,1025 4848,1045 5505,1120 6100,1368 6630,1789 6774,1903 7081,2215 7186,2355 7362,2588 7467,2759 7579,2990 7802,3455 7911,3937 7911,4460 7911,4854 7861,5165 7737,5542 7684,5702 7675,5724 7602,5885 7517,6071 7390,6292 7270,6460 7242,6499 7220,6533 7220,6538 7220,6542 8046,7371 9055,8380 10441,9766 10898,10229 10924,10274 10945,10308 10966,10364 10976,10408 10990,10472 10991,10493 10980,10554 10952,10717 10840,10865 10690,10937 10621,10971 10607,10974 10510,10977 10425,10980 10395,10977 10354,10962z M4685,7050C5214,7001 5694,6809 6100,6484 6209,6396 6396,6209 6484,6100 7151,5267 7246,4110 6721,3190 6369,2571 5798,2137 5100,1956 4706,1855 4222,1855 3830,1957 3448,2056 3140,2210 2838,2453 2337,2855 2010,3427 1908,4080 1877,4274 1877,4656 1908,4850 1948,5105 2028,5370 2133,5590 2459,6272 3077,6782 3810,6973 3967,7014 4085,7034 4290,7053 4371,7061 4583,7059 4685,7050z</Geometry>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the data that changed svg to xaml. If there is no such part, use the base.xaml.

<Style x:Key="SearchIconStyle" 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>

</ResourceDictionary>

4 changes: 2 additions & 2 deletions Flow.Launcher/Themes/Win11Dark.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<Setter Property="BorderThickness" Value="0" />
<Setter Property="CornerRadius" Value="0" />
<Setter Property="Background" Value="#2F2F2F"></Setter>
<Setter Property="Padding" Value="3 0 0 0" />
<Setter Property="Padding" Value="0 0 0 0" />
</Style>
<Style x:Key="BaseWindowStyle" TargetType="{x:Type Window}">
<Setter Property="Width" Value="596" />
Expand Down Expand Up @@ -242,7 +242,7 @@
<Style x:Key="SeparatorStyle" BasedOn="{StaticResource BaseSeparatorStyle}" TargetType="{x:Type Rectangle}">
<Setter Property="Fill" Value="#9a9a9a"/>
<Setter Property="Height" Value="1"/>
<Setter Property="Margin" Value="12 0 12 0"/>
<Setter Property="Margin" Value="12 0 12 8"/>
</Style>
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="13" />
Expand Down
4 changes: 4 additions & 0 deletions Flow.Launcher/Themes/Win11Light.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,13 @@
<Setter Property="Visibility" Value="Collapsed" />
<Style.Triggers>
<DataTrigger Binding="{Binding ElementName=ResultListBox, Path=Visibility}" Value="Visible">
<Setter Property="Margin" Value="0 0 0 8" />
<Setter Property="Visibility" Value="Visible" />
</DataTrigger>
</Style.Triggers>
</Style>
<Style x:Key="SearchIconStyle" TargetType="{x:Type Path}">
</Style>

</ResourceDictionary>

Loading