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

Adjust Control Pressed Color

Browse source
This commit is contained in:
DB p 2021-11-08 19:57:58 +09:00
parent 309f7ee1fe
commit 0de2310a9f
2 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Flow.Launcher/Resources/CustomControlTemplate.xaml
View file

@ -92,7 +92,7 @@
<Setter TargetName="RootGrid" Property="Background" Value="{DynamicResource CheckBoxBackgroundUnchecked}" />
<Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUnchecked}" />
<Setter TargetName="NormalRectangle" Property="Stroke" Value="#868686" />
<Setter TargetName="NormalRectangle" Property="Fill" Value="{DynamicResource CheckBoxCheckBackgroundFillUnchecked}" />
<Setter TargetName="NormalRectangle" Property="Fill" Value="#ededed" />
<Setter TargetName="CheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundUnchecked}" />
</MultiTrigger>
<!-- UncheckedPointerOver -->
@ -116,9 +116,9 @@
</MultiTrigger.Conditions>
<Setter TargetName="ContentPresenter" Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPressed}" />
<Setter TargetName="RootGrid" Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPressed}" />
<Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPressed}" />
<Setter TargetName="NormalRectangle" Property="Stroke" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPressed}" />
<Setter TargetName="NormalRectangle" Property="Fill" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPressed}" />
<Setter TargetName="RootGrid" Property="BorderBrush" Value="#b7b7b7" />
<Setter TargetName="NormalRectangle" Property="Stroke" Value="#b7b7b7" />
<Setter TargetName="NormalRectangle" Property="Fill" Value="#dcdcdc" />
<Setter TargetName="CheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPressed}" />
</MultiTrigger>
<!-- UncheckedDisabled -->
@ -536,6 +536,7 @@
TextWrapping="Wrap"
Visibility="{TemplateBinding ui:ControlHelper.HeaderVisibility}" />
<Border
x:Name="OutLine"
Grid.Row="1"
Grid.Column="0"
Grid.ColumnSpan="2"
@ -704,19 +705,23 @@
</Trigger>
<!-- Pressed -->
<Trigger SourceName="ToggleButton" Property="IsPressed" Value="True">
<Setter TargetName="Background" Property="Background" Value="{DynamicResource ComboBoxBackgroundPressed}" />
<Setter TargetName="Background" Property="Background" Value="#f6f6f6" />
<Setter TargetName="Background" Property="BorderThickness" Value="0" />
<Setter TargetName="Background" Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushPressed}" />
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ComboBoxForegroundPressed}" />
<Setter TargetName="OutLine" Property="BorderBrush" Value="#e5e5e5" />
<Setter TargetName="OutLine" Property="BorderThickness" Value="1,1,1,1" />
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="#878787" />
<Setter TargetName="PlaceholderTextBlock" Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundPressed}" />
</Trigger>
<!-- Disabled -->
<Trigger Property="IsEnabled" Value="False">
<Setter TargetName="Background" Property="Background" Value="{DynamicResource ComboBoxBackgroundDisabled}" />
<Setter TargetName="Background" Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushDisabled}" />
<Setter TargetName="HeaderContentPresenter" Property="Foreground" Value="{DynamicResource ComboBoxHeaderForegroundDisabled}" />
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
<Setter TargetName="PlaceholderTextBlock" Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundDisabled}" />
<Setter TargetName="DropDownGlyph" Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundDisabled}" />
<Setter TargetName="Background" Property="Background" Value="#f6f6f6" />
<Setter TargetName="Background" Property="BorderThickness" Value="0" />
<Setter TargetName="Background" Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushPressed}" />
<Setter TargetName="OutLine" Property="BorderBrush" Value="#e5e5e5" />
<Setter TargetName="OutLine" Property="BorderThickness" Value="1,1,1,1" />
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="#878787" />
<Setter TargetName="PlaceholderTextBlock" Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundPressed}" />
</Trigger>
<!-- Focused -->
@ -1531,9 +1536,9 @@
</MultiTrigger>
<!-- Pressed -->
<Trigger SourceName="SwitchThumb" Property="IsDragging" Value="true">
<Setter TargetName="OuterBorder" Property="Stroke" Value="{DynamicResource ToggleSwitchStrokeOffPressed}" />
<Setter TargetName="OuterBorder" Property="Fill" Value="{DynamicResource ToggleSwitchFillOffPressed}" />
<Setter TargetName="SwitchKnobOff" Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPressed}" />
<Setter TargetName="OuterBorder" Property="Stroke" Value="#5a5a5a" />
<Setter TargetName="OuterBorder" Property="Fill" Value="#dcdcdc" />
<Setter TargetName="SwitchKnobOff" Property="Fill" Value="#5a5a5a" />
<Setter TargetName="SwitchKnobOn" Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPressed}" />
<Setter TargetName="SwitchKnobBounds" Property="Fill" Value="{DynamicResource ToggleSwitchFillOnPressed}" />
<Setter TargetName="SwitchKnobBounds" Property="Stroke" Value="{DynamicResource ToggleSwitchStrokeOnPressed}" />

3
Flow.Launcher/SettingWindow.xaml
View file

@ -1759,7 +1759,7 @@
<Grid.RowDefinitions>
<RowDefinition Height="43" />
<RowDefinition Height="80" />
<RowDefinition Height="160" />
<RowDefinition Height="146" />
<RowDefinition Height="50" />
<RowDefinition Height="250" />
<RowDefinition Height="70" />
@ -1837,6 +1837,7 @@
BorderThickness="1" />
<Border
Margin="0"
Padding="0,10,0,0"
BorderThickness="0"
Style="{DynamicResource SettingGroupBox}">
<ItemsControl Style="{StaticResource SettingGrid}">