Skip to content

Commit e2d0cf4

Browse files
committed
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.
1 parent e554683 commit e2d0cf4

2 files changed

Lines changed: 27 additions & 20 deletions

File tree

Flow.Launcher/MainWindow.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,9 +314,10 @@
314314
Text="{Binding DateText}"
315315
Visibility="{Binding Settings.UseDate, Converter={StaticResource BoolToVisibilityConverter}}" />
316316
</StackPanel>
317-
<StackPanel Margin="8 0 0 0" VerticalAlignment="Center">
317+
<StackPanel VerticalAlignment="Center">
318318
<TextBlock
319319
x:Name="BatteryBox"
320+
Margin="8 0 0 0"
320321
Style="{DynamicResource ClockBox}"
321322
Text="{Binding BatteryText}"
322323
Visibility="{Binding Settings.UseBattery, Converter={StaticResource BoolToVisibilityConverter}}" />

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -333,27 +333,33 @@
333333
<StackPanel
334334
x:Name="ClockPanel"
335335
IsHitTestVisible="False"
336+
Orientation="Horizontal"
336337
Style="{DynamicResource ClockPanel}"
337338
Visibility="Visible">
338339
<!-- Because these two textblock follow SettingWindowFont, we need to revert their font family explictly -->
339-
<TextBlock
340-
x:Name="ClockBox"
341-
FontFamily="{Binding ClockPanelFont, Mode=OneTime}"
342-
Style="{DynamicResource ClockBox}"
343-
Text="{Binding ClockText}"
344-
Visibility="{Binding UseClock, Converter={StaticResource BoolToVisibilityConverter}}" />
345-
<TextBlock
346-
x:Name="DateBox"
347-
FontFamily="{Binding ClockPanelFont, Mode=OneTime}"
348-
Style="{DynamicResource DateBox}"
349-
Text="{Binding DateText}"
350-
Visibility="{Binding UseDate, Converter={StaticResource BoolToVisibilityConverter}}" />
351-
<TextBlock
352-
x:Name="BatteryBox"
353-
FontFamily="{Binding ClockPanelFont, Mode=OneTime}"
354-
Style="{DynamicResource ClockBox}"
355-
Text="{Binding BatteryText}"
356-
Visibility="{Binding UseBattery, Converter={StaticResource BoolToVisibilityConverter}}" />
340+
<StackPanel VerticalAlignment="Center">
341+
<TextBlock
342+
x:Name="ClockBox"
343+
FontFamily="{Binding ClockPanelFont, Mode=OneTime}"
344+
Style="{DynamicResource ClockBox}"
345+
Text="{Binding ClockText}"
346+
Visibility="{Binding UseClock, Converter={StaticResource BoolToVisibilityConverter}}" />
347+
<TextBlock
348+
x:Name="DateBox"
349+
FontFamily="{Binding ClockPanelFont, Mode=OneTime}"
350+
Style="{DynamicResource DateBox}"
351+
Text="{Binding DateText}"
352+
Visibility="{Binding UseDate, Converter={StaticResource BoolToVisibilityConverter}}" />
353+
</StackPanel>
354+
<StackPanel VerticalAlignment="Center">
355+
<TextBlock
356+
x:Name="BatteryBox"
357+
Margin="8 0 0 0"
358+
FontFamily="{Binding ClockPanelFont, Mode=OneTime}"
359+
Style="{DynamicResource ClockBox}"
360+
Text="{Binding BatteryText}"
361+
Visibility="{Binding UseBattery, Converter={StaticResource BoolToVisibilityConverter}}" />
362+
</StackPanel>
357363
</StackPanel>
358364
<Canvas Style="{DynamicResource SearchIconPosition}">
359365
<Path
@@ -620,7 +626,7 @@
620626

621627
<ui:SettingsCard Margin="0 4 0 0" Header="{DynamicResource Battery}">
622628
<ui:SettingsCard.HeaderIcon>
623-
<ui:FontIcon Glyph="&#xec02;" />
629+
<ui:FontIcon Glyph="&#xEBA7;" />
624630
</ui:SettingsCard.HeaderIcon>
625631

626632
<ui:ToggleSwitch

0 commit comments

Comments
 (0)