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 Accent Button Style

Browse source
This commit is contained in:
DB p 2024-06-01 03:08:14 +09:00
parent 870c2ba965
commit a02a95896e
4 changed files with 86 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1642,6 +1642,65 @@
<Style BasedOn="{StaticResource DefaultButtonStyle}" TargetType="Button" />
<Style
x:Key="AccentButtonStyle"
BasedOn="{StaticResource DefaultButtonStyle}"
TargetType="Button">
<Setter Property="Foreground" Value="{DynamicResource AccentButtonForeground}" />
<Setter Property="Background" Value="{DynamicResource AccentButtonBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrush}" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="Button">
<Border
x:Name="Background"
Background="{TemplateBinding Background}"
CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
SnapsToDevicePixels="True">
<Border x:Name="Overlay">
<Border
x:Name="Border"
Margin="1"
Padding="{TemplateBinding Padding}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="0 0 0 1"
CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}">
<ContentPresenter
x:Name="ContentPresenter"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Focusable="False"
RecognizesAccessKey="True"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
TextElement.Foreground="{TemplateBinding Foreground}" />
</Border>
</Border>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="Background" Property="Background" Value="{DynamicResource AccentButtonBackgroundPointerOver}" />
<Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushPointerOver}" />
<Setter TargetName="Overlay" Property="Background" Value="{DynamicResource AccentButtonBorderBGPointerOver}" />
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource AccentButtonForegroundPointerOver}" />
</Trigger>
<Trigger Property="IsPressed" Value="True">
<Setter TargetName="Background" Property="Background" Value="{DynamicResource AccentButtonBackgroundPressed}" />
<Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushPressed}" />
<Setter TargetName="Overlay" Property="Background" Value="{DynamicResource AccentButtonBorderBGPressed}" />
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource AccentButtonForegroundPressed}" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter TargetName="Background" Property="Background" Value="{DynamicResource AccentButtonBackgroundDisabled}" />
<Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushDisabled}" />
<Setter TargetName="Overlay" Property="Background" Value="transparent" />
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource AccentButtonForegroundDisabled}" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<!-- - Custom Toggle Switch from modern wpf for left label -->
<system:TimeSpan x:Key="RepositionDelay">0:0:0.033</system:TimeSpan>

15
Flow.Launcher/Resources/Dark.xaml
View file

@ -1605,18 +1605,23 @@
<!-- Resources for AccentButtonStyle -->
<m:StaticResource x:Key="AccentButtonBackground" ResourceKey="SystemAccentColorLight2Brush" />
<m:StaticResource x:Key="AccentButtonBackgroundPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
<m:StaticResource x:Key="AccentButtonBackgroundPressed" ResourceKey="SystemAccentColorDark1Brush" />
<m:StaticResource x:Key="AccentButtonBackgroundPointerOver" ResourceKey="SystemAccentColorLight2Brush" />
<m:StaticResource x:Key="AccentButtonBackgroundPressed" ResourceKey="SystemAccentColorLight2Brush" />
<m:StaticResource x:Key="AccentButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
<m:StaticResource x:Key="AccentButtonForeground" ResourceKey="Color01B" />
<m:StaticResource x:Key="AccentButtonForegroundPointerOver" ResourceKey="Color01B" />
<m:StaticResource x:Key="AccentButtonForegroundPressed" ResourceKey="Color23B" />
<m:StaticResource x:Key="AccentButtonForeground" ResourceKey="SystemControlForegroundAltHighBrush" />
<m:StaticResource x:Key="AccentButtonForegroundPointerOver" ResourceKey="SystemControlForegroundAltMediumHighBrush" />
<m:StaticResource x:Key="AccentButtonForegroundPressed" ResourceKey="SystemControlForegroundListLowBrush" />
<m:StaticResource x:Key="AccentButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
<m:StaticResource x:Key="AccentButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
<m:StaticResource x:Key="AccentButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
<m:StaticResource x:Key="AccentButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
<m:StaticResource x:Key="AccentButtonBorderBGPointerOver" ResourceKey="AccentButtonOverlayPointerOver" />
<m:StaticResource x:Key="AccentButtonBorderBGPressed" ResourceKey="AccentButtonOverlayPressed" />
<m:StaticResource x:Key="AccentButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
<SolidColorBrush x:Key="AccentButtonOverlayPointerOver" Color="#32555555" />
<SolidColorBrush x:Key="AccentButtonOverlayPressed" Color="#52555555" />
<sys:Boolean x:Key="UseSystemFocusVisuals">True</sys:Boolean>
<sys:Boolean x:Key="IsApplicationFocusVisualKindReveal">False</sys:Boolean>

6
Flow.Launcher/Resources/Light.xaml
View file

@ -1608,9 +1608,11 @@
<m:StaticResource x:Key="AccentButtonForegroundPointerOver" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
<m:StaticResource x:Key="AccentButtonForegroundPressed" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
<m:StaticResource x:Key="AccentButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
<m:StaticResource x:Key="AccentButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
<m:StaticResource x:Key="AccentButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
<m:StaticResource x:Key="AccentButtonBorderBrush" ResourceKey="SystemAccentColorDark2Brush" />
<m:StaticResource x:Key="AccentButtonBorderBrushPointerOver" ResourceKey="SystemAccentColorDark2Brush" />
<m:StaticResource x:Key="AccentButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
<m:StaticResource x:Key="AccentButtonBorderBGPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
<m:StaticResource x:Key="AccentButtonBorderBGPressed" ResourceKey="SystemControlForegroundTransparentBrush" />
<m:StaticResource x:Key="AccentButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
<sys:Boolean x:Key="UseSystemFocusVisuals">True</sys:Boolean>

20
Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
View file

@ -43,7 +43,7 @@
TextDecorations="None">
<TextBlock
Padding="10 5"
Foreground="White"
Foreground="{StaticResource SystemControlForegroundAltHighBrush}"
Text="{DynamicResource BecomeASponsor}" />
</Hyperlink>
</Button>
@ -51,7 +51,7 @@
</cc:Card>
<cc:Card Title="{DynamicResource releaseNotes}" Icon="&#xe8fd;">
<cc:HyperLink Uri="{Binding ReleaseNotes}" Text="{DynamicResource releaseNotes}" />
<cc:HyperLink Text="{DynamicResource releaseNotes}" Uri="{Binding ReleaseNotes}" />
</cc:Card>
<cc:Card
@ -59,15 +59,21 @@
Margin="0 14 0 0"
Icon="&#xeb41;">
<StackPanel Orientation="Horizontal">
<cc:HyperLink Margin="0 0 12 0" Uri="{Binding Website}" Text="{DynamicResource website}" />
<cc:HyperLink Uri="{Binding Github}" Text="{DynamicResource github}" />
<cc:HyperLink
Margin="0 0 12 0"
Text="{DynamicResource website}"
Uri="{Binding Website}" />
<cc:HyperLink Text="{DynamicResource github}" Uri="{Binding Github}" />
</StackPanel>
</cc:Card>
<cc:Card Title="{DynamicResource documentation}" Icon="&#xe82f;">
<StackPanel Orientation="Horizontal">
<cc:HyperLink Margin="0 0 12 0" Uri="{Binding Documentation}" Text="{DynamicResource documentation}" />
<cc:HyperLink Uri="{Binding Website}" Text="{DynamicResource website}" />
<cc:HyperLink
Margin="0 0 12 0"
Text="{DynamicResource documentation}"
Uri="{Binding Documentation}" />
<cc:HyperLink Text="{DynamicResource website}" Uri="{Binding Website}" />
</StackPanel>
</cc:Card>
@ -75,7 +81,7 @@
Title="{DynamicResource icons}"
Margin="0 14 0 0"
Icon="&#xE8FE;">
<cc:HyperLink Uri="https://icons8.com/" Text="icons8.com" />
<cc:HyperLink Text="icons8.com" Uri="https://icons8.com/" />
</cc:Card>
<cc:Card Title="{DynamicResource devtool}" Icon="&#xf12b;">