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 Tab Header Style

Browse source
This commit is contained in:
DB p 2021-11-16 21:50:19 +09:00
parent 28dd3992b1
commit 9b96510ffd
4 changed files with 24 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,6 +13,16 @@
<Setter Property="Foreground" Value="{StaticResource Color05B}" />
</Style>
<Style x:Key="TabMenu" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="14" />
<Setter Property="FontFamily" Value="Segoe UI" />
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Foreground" Value="{StaticResource Color05B}" />
</Style>
<Style x:Key="TabMenuIcon" TargetType="{x:Type TextBlock}">
<Setter Property="Margin" Value="0,0,12,0" />
<Setter Property="FontSize" Value="16" />
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="FontFamily" Value="/Resources/#Segoe Fluent Icons" />
<Setter Property="Foreground" Value="{StaticResource Color05B}" />
</Style>
<Style x:Key="SettingSeparatorStyle" TargetType="{x:Type Separator}">

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

@ -32,6 +32,7 @@
<SolidColorBrush x:Key="Color23B" Color="#272727" />
<SolidColorBrush x:Key="Color24B" Color="#9a9a9a" />
<SolidColorBrush x:Key="Color25B" Color="#323232" />
<SolidColorBrush x:Key="ThemeHoverButton" Color="#3c3c3c" />
<Color x:Key="Color01">#202020</Color>
<Color x:Key="Color02">#2b2b2b</Color>
<Color x:Key="Color03">#1d1d1d</Color>

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

@ -29,6 +29,7 @@
<SolidColorBrush x:Key="Color20B" Color="#5a5a5a" />
<SolidColorBrush x:Key="Color21B" Color="#cccccc" />
<SolidColorBrush x:Key="Color22B" Color="#f0f0f0" />
<SolidColorBrush x:Key="ThemeHoverButton" Color="#f6f6f6" />
<Color x:Key="Color01">#f3f3f3</Color>
<Color x:Key="Color02">#ffffff</Color>
<Color x:Key="Color03">#e5e5e5</Color>
@ -106,7 +107,7 @@
<CornerRadius x:Key="ControlCornerRadius">2,2,2,2</CornerRadius>
<CornerRadius x:Key="ControlCornerRadius">4,4,4,4</CornerRadius>
<CornerRadius x:Key="OverlayCornerRadius">4,4,4,4</CornerRadius>

58
Flow.Launcher/SettingWindow.xaml
View file

@ -181,7 +181,7 @@
x:Name="Spacer"
Width="Auto"
Height="Auto"
Margin="8,4,8,0"
Margin="16,0,8,8"
Padding="0,0,0,0"
BorderBrush="Transparent"
BorderThickness="0">
@ -191,7 +191,7 @@
CornerRadius="5">
<ContentPresenter
x:Name="ContentSite"
Margin="12,12,0,12"
Margin="12,11,0,11"
HorizontalAlignment="LEFT"
VerticalAlignment="Center"
ContentSource="Header"
@ -484,7 +484,6 @@
Grid.Column="0"
Grid.ColumnSpan="5"
Height="auto"
Background="#f3f3f3"
SelectedIndex="1"
TabStripPlacement="Left">
<TabItem Style="{DynamicResource logo}">
@ -517,12 +516,7 @@
<ColumnDefinition Width="Auto" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock
Grid.Column="0"
Margin="0,0,12,0"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource TabMenu}">
<TextBlock Grid.Column="0" Style="{StaticResource TabMenuIcon}">
&#xe713;
</TextBlock>
<TextBlock
@ -865,12 +859,7 @@
<ColumnDefinition Width="Auto" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock
Grid.Column="0"
Margin="0,0,12,0"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource TabMenu}">
<TextBlock Grid.Column="0" Style="{StaticResource TabMenuIcon}">
&#xea86;
</TextBlock>
<TextBlock
@ -1239,12 +1228,7 @@
<ColumnDefinition Width="Auto" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock
Grid.Column="0"
Margin="0,0,12,0"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource TabMenu}">
<TextBlock Grid.Column="0" Style="{StaticResource TabMenuIcon}">
&#xe719;
</TextBlock>
<TextBlock
@ -1496,12 +1480,7 @@
<ColumnDefinition Width="Auto" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock
Grid.Column="0"
Margin="0,0,12,0"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource TabMenu}">
<TextBlock Grid.Column="0" Style="{StaticResource TabMenuIcon}">
&#xe790;
</TextBlock>
<TextBlock
@ -1697,12 +1676,12 @@
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="true">
<Setter TargetName="Bd" Property="Background" Value="#f6f6f6" />
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource ThemeHoverButton}" />
</Trigger>
<Trigger Property="IsSelected" Value="true">
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource ToggleSwitchFillOn}" />
<Setter TargetName="Bd2" Property="BorderThickness" Value="0" />
<Setter TargetName="Bd2" Property="TextElement.Foreground" Value="#ffffff" />
<Setter TargetName="Bd2" Property="TextElement.Foreground" Value="{DynamicResource Color02B}" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
@ -1947,12 +1926,7 @@
<ColumnDefinition Width="Auto" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock
Grid.Column="0"
Margin="0,0,12,0"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource TabMenu}">
<TextBlock Grid.Column="0" Style="{StaticResource TabMenuIcon}">
&#xe92e;
</TextBlock>
<TextBlock
@ -2145,12 +2119,7 @@
<ColumnDefinition Width="Auto" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock
Grid.Column="0"
Margin="0,0,12,0"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource TabMenu}">
<TextBlock Grid.Column="0" Style="{StaticResource TabMenuIcon}">
&#xec27;
</TextBlock>
<TextBlock
@ -2321,12 +2290,7 @@
<ColumnDefinition Width="Auto" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock
Grid.Column="0"
Margin="0,0,12,0"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource TabMenu}">
<TextBlock Grid.Column="0" Style="{StaticResource TabMenuIcon}">
&#xe946;
</TextBlock>
<TextBlock