Skip to content

Commit 6048de4

Browse files
committed
- Fix Querybox Width
- Fix Pink Theme Width - Change WinLight highlight
1 parent 8e93969 commit 6048de4

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

Flow.Launcher/MainWindow.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<TextBox x:Name="QueryTextSuggestionBox"
7171
Style="{DynamicResource QuerySuggestionBoxStyle}"
7272
IsEnabled="False"
73-
Margin="16,0,66,0">
73+
Padding="16,0,60,0">
7474
<TextBox.Text>
7575
<MultiBinding Converter="{StaticResource QuerySuggestionBoxConverter}">
7676
<Binding ElementName="QueryTextBox" Path="Text"/>
@@ -85,7 +85,7 @@
8585
AllowDrop="True"
8686
Visibility="Visible"
8787
Background="Transparent"
88-
Margin="16,0,66,0">
88+
Padding="16,0,60,0">
8989
<TextBox.ContextMenu>
9090
<ContextMenu>
9191
<MenuItem Command="ApplicationCommands.Cut"/>

Flow.Launcher/SettingWindow.xaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
55
xmlns:flowlauncher="clr-namespace:Flow.Launcher"
6+
xmlns:converters="clr-namespace:Flow.Launcher.Converters"
67
xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
78
xmlns:scm="clr-namespace:System.ComponentModel;assembly=WindowsBase"
89
xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
@@ -28,6 +29,7 @@
2829
<CommandBinding Command="Close" Executed="OnCloseExecuted"/>
2930
</Window.CommandBindings>
3031
<Window.Resources>
32+
<converters:BorderClipConverter x:Key="BorderClipConverter"/>
3133
<CollectionViewSource Source="{Binding Source={x:Static Fonts.SystemFontFamilies}}" x:Key="SortedFonts">
3234
<CollectionViewSource.SortDescriptions>
3335
<scm:SortDescription PropertyName="Source"/>

Flow.Launcher/Themes/Base.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Setter Property="Height" Value="56" />
1111
<Setter Property="Padding" Value="0 4 0 0" />
1212
<Setter Property="Background" Value="#2F2F2F" />
13-
<Setter Property="Width" Value="536" />
13+
<Setter Property="Width" Value="586" />
1414
<Setter Property="Foreground" Value="#E3E0E3" />
1515
<Setter Property="CaretBrush" Value="#E3E0E3" />
1616
<Setter Property="VerticalContentAlignment" Value="Center" />
@@ -39,7 +39,7 @@
3939
<!-- Further font customisations are dynamically loaded in Theme.cs -->
4040
<Style x:Key="BaseQuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
4141
<Setter Property="Foreground" Value="DarkGray" />
42-
<Setter Property="Width" Value="536" />
42+
<Setter Property="Width" Value="56" />
4343
<Setter Property="Background" Value="Transparent" />
4444
<Setter Property="Padding" Value="0 4 0 0" />
4545
<Setter Property="HorizontalAlignment" Value="Left" />

Flow.Launcher/Themes/Pink.xaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,17 @@
66
<Setter Property="Background" Value="#1f1d1f"/>
77
<Setter Property="Foreground" Value="#cc1081" />
88
<Setter Property="CaretBrush" Value="#cc1081" />
9-
<Setter Property="Width" Value="370"/>
9+
<Setter Property="SelectionBrush" Value="#e564b1"/>
1010
</Style>
1111

1212
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
1313
<Setter Property="Background" Value="#1f1d1f"/>
1414
<Setter Property="Foreground" Value="#71114b" />
15-
<Setter Property="Width" Value="370"/>
1615
</Style>
1716

1817
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
1918
<Setter Property="Background" Value="#1f1d1f"></Setter>
20-
<Setter Property="Width" Value="456"></Setter>
19+
<Setter Property="Width" Value="586"></Setter>
2120
<Setter Property="BorderThickness" Value="2"></Setter>
2221
<Setter Property="BorderBrush" Value="#000000"></Setter>
2322
</Style>

Flow.Launcher/Themes/Win10Light.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<Setter Property="Cursor" Value="Arrow" />
5959
</Style>
6060
<Style x:Key="HighlightStyle">
61-
<Setter Property="Inline.FontWeight" Value="Bold" />
61+
<Setter Property="Inline.Foreground" Value="#0078d7" />
6262
</Style>
6363
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
6464
<Setter Property="FontSize" Value="15" />

0 commit comments

Comments
 (0)