Skip to content

Commit c7ab6c0

Browse files
committed
Fix Querybar text invade magnifying glass area
(This is due to the problem that the size of the window changes when the shadow is turned on.) - remove all querybox/suggest querybox width of themes - Add padding for Magnifying glass area
1 parent d4fbe33 commit c7ab6c0

File tree

8 files changed

+18
-26
lines changed

8 files changed

+18
-26
lines changed

Flow.Launcher/Themes/Base.xaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@
88
<Setter Property="FontSize" Value="28" />
99
<Setter Property="FontWeight" Value="Regular" />
1010
<Setter Property="Margin" Value="16 7 0 7" />
11-
<Setter Property="Padding" Value="0 4 0 0" />
11+
<Setter Property="Padding" Value="0 4 68 0" />
1212
<Setter Property="Background" Value="#2F2F2F" />
13-
<Setter Property="Width" Value="664" />
1413
<Setter Property="Height" Value="48" />
1514
<Setter Property="Foreground" Value="#E3E0E3" />
1615
<Setter Property="CaretBrush" Value="#E3E0E3" />
1716
<Setter Property="VerticalContentAlignment" Value="Center" />
18-
<Setter Property="HorizontalAlignment" Value="Left" />
17+
<Setter Property="HorizontalAlignment" Value="Stretch" />
1918
<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
2019
<Setter Property="Template">
2120
<Setter.Value>
@@ -42,10 +41,9 @@
4241
<Setter Property="Foreground" Value="DarkGray" />
4342
<Setter Property="Height" Value="48" />
4443
<Setter Property="Margin" Value="16 7 0 7" />
45-
<Setter Property="Width" Value="664" />
4644
<Setter Property="Background" Value="Transparent" />
47-
<Setter Property="Padding" Value="0 4 0 0" />
48-
<Setter Property="HorizontalAlignment" Value="Left" />
45+
<Setter Property="Padding" Value="0 4 68 0" />
46+
<Setter Property="HorizontalAlignment" Value="Stretch" />
4947
<Setter Property="VerticalAlignment" Value="Center" />
5048
</Style>
5149

Flow.Launcher/Themes/Discord Dark.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
<Setter Property="Background" Value="#36393f" />
1313
<Setter Property="CaretBrush" Value="#ffffff" />
1414
<Setter Property="SelectionBrush" Value="#0a68d8"/>
15-
<Setter Property="Width" Value="490" />
1615
<Setter Property="Height" Value="42" />
1716
<Setter Property="FontSize" Value="24" />
17+
<Setter Property="Padding" Value="0 0 66 0" />
1818
</Style>
1919
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
2020
<Setter Property="Foreground" Value="#72767d" />
2121
<Setter Property="Background" Value="#36393f" />
22-
<Setter Property="Width" Value="490" />
2322
<Setter Property="Height" Value="42" />
2423
<Setter Property="FontSize" Value="24" />
24+
<Setter Property="Padding" Value="0 0 66 0" />
2525
</Style>
2626
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
2727
<Setter Property="BorderThickness" Value="2" />

Flow.Launcher/Themes/League.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Setter Property="Background" Value="#161614"/>
77
<Setter Property="Foreground" Value="#b88f3a" />
88
<Setter Property="CaretBrush" Value="#b88f3a" />
9-
<Setter Property="Width" Value="490" />
9+
<Setter Property="Padding" Value="0 0 66 0" />
1010
<Setter Property="Height" Value="42" />
1111
</Style>
1212
<Style x:Key="ItemGlyph" BasedOn="{StaticResource BaseGlyphStyle}" TargetType="{x:Type TextBlock}">
@@ -15,7 +15,7 @@
1515
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
1616
<Setter Property="Background" Value="#161614"/>
1717
<Setter Property="Foreground" Value="#a09b8c" />
18-
<Setter Property="Width" Value="490" />
18+
<Setter Property="Padding" Value="0 0 66 0" />
1919
<Setter Property="Height" Value="42" />
2020
</Style>
2121

Flow.Launcher/Themes/Metro Server.xaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@
88
<Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
99
<Setter Property="Foreground" Value="#FFFFFF" />
1010
<Setter Property="Background" Value="#001e4e"/>
11+
<Setter Property="Padding" Value="0 0 18 0" />
1112
</Style>
1213
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
1314
<Setter Property="Foreground" Value="#344c71" />
1415
<Setter Property="Background" Value="#001e4e" />
16+
<Setter Property="Padding" Value="0 0 18 0" />
1517
</Style>
1618

1719
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">

Flow.Launcher/Themes/Sublime.xaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,15 @@
1313
<Setter Property="Foreground" Value="#d2d8e5" />
1414
<Setter Property="CaretBrush" Value="#FFAA47" />
1515
<Setter Property="FontSize" Value="26" />
16-
<Setter Property="Width" Value="490" />
1716
<Setter Property="Height" Value="42" />
18-
<Setter Property="Padding" Value="0 4 0 0" />
17+
<Setter Property="Padding" Value="0 4 66 0" />
1918
</Style>
2019
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
2120
<Setter Property="Background" Value="#303840" />
2221
<Setter Property="Foreground" Value="#798189" />
2322
<Setter Property="FontSize" Value="26" />
24-
<Setter Property="Width" Value="490" />
2523
<Setter Property="Height" Value="42" />
26-
<Setter Property="Padding" Value="0 4 0 0" />
24+
<Setter Property="Padding" Value="0 4 66 0" />
2725
</Style>
2826
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
2927
<Setter Property="BorderThickness" Value="2" />

Flow.Launcher/Themes/Win10Light.xaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,14 @@
1616
<Setter Property="BorderBrush" Value="Black"/>
1717
<Setter Property="BorderThickness" Value="0"/>
1818
<Setter Property="FontSize" Value="28" />
19-
<Setter Property="Width" Value="490" />
2019
<Setter Property="Height" Value="42" />
21-
<Setter Property="Padding" Value="0 4 0 0" />
20+
<Setter Property="Padding" Value="0 4 66 0" />
2221
</Style>
2322
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
2423
<Setter Property="Background" Value="#dddddd" />
2524
<Setter Property="Foreground" Value="#c6c6c6" />
2625
<Setter Property="FontSize" Value="28" />
27-
<Setter Property="Padding" Value="0 4 0 0" />
28-
<Setter Property="Width" Value="490" />
26+
<Setter Property="Padding" Value="0 4 66 0" />
2927
<Setter Property="Height" Value="42" />
3028
</Style>
3129
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">

Flow.Launcher/Themes/Win11Dark.xaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,14 @@
1414
<Setter Property="Foreground" Value="#FFFFFF" />
1515
<Setter Property="CaretBrush" Value="#FFFFFF" />
1616
<Setter Property="FontSize" Value="26" />
17-
<Setter Property="Padding" Value="0 4 0 0" />
18-
<Setter Property="Width" Value="490" />
17+
<Setter Property="Padding" Value="0 4 66 0" />
1918
<Setter Property="Height" Value="42" />
2019
</Style>
2120
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
2221
<Setter Property="Background" Value="#202020" />
2322
<Setter Property="Foreground" Value="#7b7b7b" />
2423
<Setter Property="FontSize" Value="26" />
25-
<Setter Property="Padding" Value="0 4 0 0" />
26-
<Setter Property="Width" Value="490" />
24+
<Setter Property="Padding" Value="0 4 66 0" />
2725
<Setter Property="Height" Value="42" />
2826
</Style>
2927
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">

Flow.Launcher/Themes/Win11Light.xaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,14 @@
1414
<Setter Property="Foreground" Value="#000000" />
1515
<Setter Property="CaretBrush" Value="#000000" />
1616
<Setter Property="FontSize" Value="26" />
17-
<Setter Property="Padding" Value="0 4 0 0" />
18-
<Setter Property="Width" Value="490" />
17+
<Setter Property="Padding" Value="0 4 66 0" />
1918
<Setter Property="Height" Value="42" />
2019
</Style>
2120
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
2221
<Setter Property="Background" Value="#f3f3f3" />
2322
<Setter Property="Foreground" Value="#b5b5b5" />
2423
<Setter Property="FontSize" Value="26" />
25-
<Setter Property="Padding" Value="0 4 0 0" />
26-
<Setter Property="Width" Value="490" />
24+
<Setter Property="Padding" Value="0 4 66 0" />
2725
<Setter Property="Height" Value="42" />
2826
</Style>
2927
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">

0 commit comments

Comments
 (0)