From e2d0cf40567a3a2f5726c322917bfc5142fba013 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 4 Mar 2026 13:35:08 +0800
Subject: [PATCH] Refactor clock/date/battery layout; update battery icon

Separated BatteryBox into its own StackPanel with margin for improved alignment and spacing in MainWindow.xaml and SettingsPaneTheme.xaml. Updated the battery icon glyph in SettingsPaneTheme.xaml for a refreshed visual appearance.
---
 Flow.Launcher/MainWindow.xaml                 |  3 +-
 .../SettingPages/Views/SettingsPaneTheme.xaml | 44 +++++++++++--------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 631b5a5bb..93e884b15 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -314,9 +314,10 @@
                             Text="{Binding DateText}"
                             Visibility="{Binding Settings.UseDate, Converter={StaticResource BoolToVisibilityConverter}}" />
                     </StackPanel>
-                    <StackPanel Margin="8 0 0 0" VerticalAlignment="Center">
+                    <StackPanel VerticalAlignment="Center">
                         <TextBlock
                             x:Name="BatteryBox"
+                            Margin="8 0 0 0"
                             Style="{DynamicResource ClockBox}"
                             Text="{Binding BatteryText}"
                             Visibility="{Binding Settings.UseBattery, Converter={StaticResource BoolToVisibilityConverter}}" />
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
index 5bcc5f66a..c6453c807 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
@@ -333,27 +333,33 @@
                                         <StackPanel
                                             x:Name="ClockPanel"
                                             IsHitTestVisible="False"
+                                            Orientation="Horizontal"
                                             Style="{DynamicResource ClockPanel}"
                                             Visibility="Visible">
                                             <!--  Because these two textblock follow SettingWindowFont, we need to revert their font family explictly  -->
-                                            <TextBlock
-                                                x:Name="ClockBox"
-                                                FontFamily="{Binding ClockPanelFont, Mode=OneTime}"
-                                                Style="{DynamicResource ClockBox}"
-                                                Text="{Binding ClockText}"
-                                                Visibility="{Binding UseClock, Converter={StaticResource BoolToVisibilityConverter}}" />
-                                            <TextBlock
-                                                x:Name="DateBox"
-                                                FontFamily="{Binding ClockPanelFont, Mode=OneTime}"
-                                                Style="{DynamicResource DateBox}"
-                                                Text="{Binding DateText}"
-                                                Visibility="{Binding UseDate, Converter={StaticResource BoolToVisibilityConverter}}" />
-                                            <TextBlock
-                                                x:Name="BatteryBox"
-                                                FontFamily="{Binding ClockPanelFont, Mode=OneTime}"
-                                                Style="{DynamicResource ClockBox}"
-                                                Text="{Binding BatteryText}"
-                                                Visibility="{Binding UseBattery, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                            <StackPanel VerticalAlignment="Center">
+                                                <TextBlock
+                                                    x:Name="ClockBox"
+                                                    FontFamily="{Binding ClockPanelFont, Mode=OneTime}"
+                                                    Style="{DynamicResource ClockBox}"
+                                                    Text="{Binding ClockText}"
+                                                    Visibility="{Binding UseClock, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                                <TextBlock
+                                                    x:Name="DateBox"
+                                                    FontFamily="{Binding ClockPanelFont, Mode=OneTime}"
+                                                    Style="{DynamicResource DateBox}"
+                                                    Text="{Binding DateText}"
+                                                    Visibility="{Binding UseDate, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                            </StackPanel>
+                                            <StackPanel VerticalAlignment="Center">
+                                                <TextBlock
+                                                    x:Name="BatteryBox"
+                                                    Margin="8 0 0 0"
+                                                    FontFamily="{Binding ClockPanelFont, Mode=OneTime}"
+                                                    Style="{DynamicResource ClockBox}"
+                                                    Text="{Binding BatteryText}"
+                                                    Visibility="{Binding UseBattery, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                            </StackPanel>
                                         </StackPanel>
                                         <Canvas Style="{DynamicResource SearchIconPosition}">
                                             <Path
@@ -620,7 +626,7 @@
 
             <ui:SettingsCard Margin="0 4 0 0" Header="{DynamicResource Battery}">
                 <ui:SettingsCard.HeaderIcon>
-                    <ui:FontIcon Glyph="&#xec02;" />
+                    <ui:FontIcon Glyph="&#xEBA7;" />
                 </ui:SettingsCard.HeaderIcon>
 
                 <ui:ToggleSwitch