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

Remove BatteryBox style and reuse ClockBox style for battery display

Browse source 
- Remove BaseBatteryBox and BatteryBox style definitions from Base.xaml
- Remove BatteryBox style overrides from all theme files
- Update BatteryBox TextBlock in MainWindow.xaml to use ClockBox style
- Update BatteryBox TextBlock in SettingsPaneTheme.xaml to use ClockBox style

Co-authored-by: Jack251970 <53996452+Jack251970@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2026-03-04 04:56:28 +00:00
parent 4b62a1f29d
commit 9ed40978c3
20 changed files with 2 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Flow.Launcher/MainWindow.xaml
View file

@ -313,7 +313,7 @@
Visibility="{Binding Settings.UseDate, Converter={StaticResource BoolToVisibilityConverter}}" />
<TextBlock
x:Name="BatteryBox"
Style="{DynamicResource BatteryBox}"
Style="{DynamicResource ClockBox}"
Text="{Binding BatteryText}"
Visibility="{Binding Settings.UseBattery, Converter={StaticResource BoolToVisibilityConverter}}" />
</StackPanel>

2
Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
View file

@ -351,7 +351,7 @@
<TextBlock
x:Name="BatteryBox"
FontFamily="{Binding ClockPanelFont, Mode=OneTime}"
Style="{DynamicResource BatteryBox}"
Style="{DynamicResource ClockBox}"
Text="{Binding BatteryText}"
Visibility="{Binding UseBattery, Converter={StaticResource BoolToVisibilityConverter}}" />
</StackPanel>

20
Flow.Launcher/Themes/Base.xaml
View file

@ -152,20 +152,6 @@
</DataTrigger>
</Style.Triggers>
</Style>
<Style x:Key="BaseBatteryBox" TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="18" />
<Setter Property="Foreground" Value="#8f8f8f" />
<Setter Property="HorizontalAlignment" Value="Right" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="0 0 0 0" />
<Style.Triggers>
<DataTrigger Binding="{Binding ElementName=ClockBox, Path=Visibility}" Value="Visible">
<Setter Property="FontSize" Value="14" />
<Setter Property="Margin" Value="0 0 0 3" />
</DataTrigger>
</Style.Triggers>
</Style>
<Style
x:Key="ClockBox"
BasedOn="{StaticResource BaseClockBox}"
@ -178,12 +164,6 @@
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#C6C6C6" />
</Style>
<Style
x:Key="BatteryBox"
BasedOn="{StaticResource BaseBatteryBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#C6C6C6" />
</Style>
<Style
x:Key="ClockPanel"
BasedOn="{StaticResource BaseClockPanel}"

7
Flow.Launcher/Themes/BlurBlack Darker.xaml
View file

@ -174,13 +174,6 @@
<Setter Property="Foreground" Value="#ffffff" />
<Setter Property="Opacity" Value="0.2" />
</Style>
<Style
x:Key="BatteryBox"
BasedOn="{StaticResource BaseBatteryBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#ffffff" />
<Setter Property="Opacity" Value="0.2" />
</Style>
<Style
x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}"

7
Flow.Launcher/Themes/BlurWhite.xaml
View file

@ -178,13 +178,6 @@
<Setter Property="Foreground" Value="#000000" />
<Setter Property="Opacity" Value="0.2" />
</Style>
<Style
x:Key="BatteryBox"
BasedOn="{StaticResource BaseBatteryBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#000000" />
<Setter Property="Opacity" Value="0.2" />
</Style>
<Style
x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}"

6
Flow.Launcher/Themes/Circle System.xaml
View file

@ -173,12 +173,6 @@
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#999aa3" />
</Style>
<Style
x:Key="BatteryBox"
BasedOn="{StaticResource BaseBatteryBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#999aa3" />
</Style>
<Style
x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}"

6
Flow.Launcher/Themes/Cyan Dark.xaml
View file

@ -183,12 +183,6 @@
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#57c0b2" />
</Style>
<Style
x:Key="BatteryBox"
BasedOn="{StaticResource BaseBatteryBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#57c0b2" />
</Style>
<Style
x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}"

6
Flow.Launcher/Themes/Darker Glass.xaml
View file

@ -168,12 +168,6 @@
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#6f737a" />
</Style>
<Style
x:Key="BatteryBox"
BasedOn="{StaticResource BaseBatteryBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#6f737a" />
</Style>
<Style
x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}"

6
Flow.Launcher/Themes/Discord Dark.xaml
View file

@ -166,12 +166,6 @@
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#72767d" />
</Style>
<Style
x:Key="BatteryBox"
BasedOn="{StaticResource BaseBatteryBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#72767d" />
</Style>
<Style
x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}"

6
Flow.Launcher/Themes/Dracula.xaml
View file

@ -166,12 +166,6 @@
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#6272a4" />
</Style>
<Style
x:Key="BatteryBox"
BasedOn="{StaticResource BaseBatteryBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#6272a4" />
</Style>
<Style
x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}"

6
Flow.Launcher/Themes/Gray.xaml
View file

@ -163,12 +163,6 @@
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#b7babe" />
</Style>
<Style
x:Key="BatteryBox"
BasedOn="{StaticResource BaseBatteryBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#b7babe" />
</Style>
<Style
x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}"

6
Flow.Launcher/Themes/League.xaml
View file

@ -140,12 +140,6 @@
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#4bb44b" />
</Style>
<Style
x:Key="BatteryBox"
BasedOn="{StaticResource BaseBatteryBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#4bb44b" />
</Style>
<Style
x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}"

6
Flow.Launcher/Themes/Midnight.xaml
View file

@ -163,12 +163,6 @@
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#5f6673" />
</Style>
<Style
x:Key="BatteryBox"
BasedOn="{StaticResource BaseBatteryBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#5f6673" />
</Style>
<Style
x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}"

6
Flow.Launcher/Themes/Nord Darker.xaml
View file

@ -140,12 +140,6 @@
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#6F7C95" />
</Style>
<Style
x:Key="BatteryBox"
BasedOn="{StaticResource BaseBatteryBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#6F7C95" />
</Style>
<Style
x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}"

7
Flow.Launcher/Themes/Pink.xaml
View file

@ -137,13 +137,6 @@
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="Foreground" Value="#71114b" />
</Style>
<Style
x:Key="BatteryBox"
BasedOn="{StaticResource BaseBatteryBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="Foreground" Value="#71114b" />
</Style>
<Style
x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}"

13
Flow.Launcher/Themes/SlimLight.xaml
View file

@ -222,19 +222,6 @@
</DataTrigger>
</Style.Triggers>
</Style>
<Style
x:Key="BatteryBox"
BasedOn="{StaticResource BaseBatteryBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="FontSize" Value="14" />
<Setter Property="Foreground" Value="#bebebe" />
<Style.Triggers>
<DataTrigger Binding="{Binding ElementName=ClockBox, Path=Visibility}" Value="Visible">
<Setter Property="FontSize" Value="14" />
<Setter Property="Margin" Value="0 0 0 3" />
</DataTrigger>
</Style.Triggers>
</Style>
<Style
x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}"

6
Flow.Launcher/Themes/Sublime.xaml
View file

@ -163,12 +163,6 @@
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#5bafb0" />
</Style>
<Style
x:Key="BatteryBox"
BasedOn="{StaticResource BaseBatteryBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#5bafb0" />
</Style>
<Style
x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}"

6
Flow.Launcher/Themes/Ubuntu.xaml
View file

@ -180,12 +180,6 @@
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#c2c2c2" />
</Style>
<Style
x:Key="BatteryBox"
BasedOn="{StaticResource BaseBatteryBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#c2c2c2" />
</Style>
<Style
x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}"

6
Flow.Launcher/Themes/Win10System.xaml
View file

@ -190,12 +190,6 @@
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
</Style>
<Style
x:Key="BatteryBox"
BasedOn="{StaticResource BaseBatteryBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
</Style>
<Style
x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}"

6
Flow.Launcher/Themes/Win11Light.xaml
View file

@ -215,12 +215,6 @@
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="{DynamicResource ClockDateForeground}" />
</Style>
<Style
x:Key="BatteryBox"
BasedOn="{StaticResource BaseBatteryBox}"
TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="{DynamicResource ClockDateForeground}" />
</Style>
<Style
x:Key="PreviewBorderStyle"
BasedOn="{StaticResource BasePreviewBorderStyle}"