Skip to content

Commit d09899e

Browse files
committed
Adjust Placeholder color
1 parent c33fae9 commit d09899e

File tree

3 files changed

+18
-11
lines changed

3 files changed

+18
-11
lines changed

Flow.Launcher/Resources/CustomControlTemplate.xaml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2777,7 +2777,7 @@
27772777
</Grid>
27782778
<ControlTemplate.Triggers>
27792779
<Trigger Property="ui:ControlHelper.PlaceholderForeground" Value="{x:Null}">
2780-
<Setter TargetName="PlaceholderTextContentPresenter" Property="Foreground" Value="{DynamicResource TextControlPlaceholderForeground}" />
2780+
<Setter TargetName="PlaceholderTextContentPresenter" Property="Foreground" Value="{DynamicResource NumberBoxPlaceHolder}" />
27812781
</Trigger>
27822782
<Trigger Property="ui:TextBoxHelper.HasText" Value="True">
27832783
<Setter TargetName="PlaceholderTextContentPresenter" Property="Visibility" Value="Collapsed" />
@@ -3587,7 +3587,7 @@
35873587
<Grid>
35883588
<Grid.RowDefinitions>
35893589
<RowDefinition Height="*" />
3590-
<RowDefinition Height="80" x:Name="CommandSpaceRow"/>
3590+
<RowDefinition x:Name="CommandSpaceRow" Height="80" />
35913591
</Grid.RowDefinitions>
35923592
<ScrollViewer
35933593
x:Name="ContentScrollViewer"
@@ -3638,13 +3638,14 @@
36383638
TextWrapping="Wrap" />
36393639
</Grid>
36403640
</ScrollViewer>
3641-
<Border x:Name="ButtonAreaBorder"
3642-
Grid.Row="1"
3643-
Padding="26 0 26 0"
3644-
Background="{DynamicResource PopupButtonAreaBGColor}"
3645-
BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
3646-
BorderThickness="0 1 0 0"
3647-
CornerRadius="0 0 8 8">
3641+
<Border
3642+
x:Name="ButtonAreaBorder"
3643+
Grid.Row="1"
3644+
Padding="26 0 26 0"
3645+
Background="{DynamicResource PopupButtonAreaBGColor}"
3646+
BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
3647+
BorderThickness="0 1 0 0"
3648+
CornerRadius="0 0 8 8">
36483649
<Grid
36493650
x:Name="CommandSpace"
36503651
HorizontalAlignment="Stretch"
@@ -3792,8 +3793,10 @@
37923793
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="CommandSpace" Storyboard.TargetProperty="Visibility">
37933794
<DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Collapsed}" />
37943795
</ObjectAnimationUsingKeyFrames>
3795-
<!-- If the window has no buttons, it's assumed that the buttons are drawn directly within the window itself (as in the case of the HotkeyDialog).
3796-
In this case, the command space area is completely hidden. -->
3796+
<!--
3797+
If the window has no buttons, it's assumed that the buttons are drawn directly within the window itself (as in the case of the HotkeyDialog).
3798+
In this case, the command space area is completely hidden.
3799+
-->
37973800
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonAreaBorder" Storyboard.TargetProperty="Visibility">
37983801
<DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Collapsed}" />
37993802
</ObjectAnimationUsingKeyFrames>

Flow.Launcher/Resources/Dark.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106
<Color x:Key="NumberBoxColor24">#f5f5f5</Color>
107107
<Color x:Key="NumberBoxColor25">#464646</Color>
108108
<Color x:Key="NumberBoxColor26">#ffffff</Color>
109+
<SolidColorBrush x:Key="NumberBoxPlaceHolder" Color="#565656" />
109110
<Color x:Key="HoverStoreGrid">#272727</Color>
110111

111112
<!-- Resources for HotkeyControl -->

Flow.Launcher/Resources/Light.xaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,11 @@
9797
<Color x:Key="NumberBoxColor24">#f5f5f5</Color>
9898
<Color x:Key="NumberBoxColor25">#878787</Color>
9999
<Color x:Key="NumberBoxColor26">#1b1b1b</Color>
100+
<SolidColorBrush x:Key="NumberBoxPlaceHolder" Color="#A2A2A2" />
100101
<Color x:Key="HoverStoreGrid">#f6f6f6</Color>
101102

103+
104+
102105
<!-- Resources for HotkeyControl -->
103106
<SolidColorBrush x:Key="CustomHotkeyHover" Color="#f6f6f6" />
104107
<!-- Resources for Expander -->

0 commit comments

Comments
 (0)