Skip to content

Commit 3f3612a

Browse files
authored
Merge pull request #2775 from onesounds/240613-AddTypeIconForTheme
Change IsDark Type Icon in Theme List
2 parents 78daf0b + 7ceadec commit 3f3612a

File tree

3 files changed

+19
-7
lines changed

3 files changed

+19
-7
lines changed

Flow.Launcher/Languages/en.xaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,8 @@
180180
<system:String x:Key="AnimationSpeedCustom">Custom</system:String>
181181
<system:String x:Key="Clock">Clock</system:String>
182182
<system:String x:Key="Date">Date</system:String>
183+
<system:String x:Key="TypeIsDarkToolTip">This theme supports two(light/dark) modes.</system:String>
184+
<system:String x:Key="TypeHasBlurToolTip">This theme supports Blur Transparent Background.</system:String>
183185

184186

185187
<!-- Setting Hotkey -->

Flow.Launcher/Resources/SettingWindowStyle.xaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<converters:TextConverter x:Key="TextConverter" />
99
<core:TranslationConverter x:Key="TranslationConverter" />
1010

11+
<!-- Icon for Theme Type Label -->
12+
<Geometry x:Key="circle_half_stroke_solid">F1 M512,512z M0,0z M448,256C448,150,362,64,256,64L256,448C362,448,448,362,448,256z M0,256A256,256,0,1,1,512,256A256,256,0,1,1,0,256z</Geometry>
1113
<Style x:Key="StoreItemFocusVisualStyleKey">
1214
<Setter Property="Control.Template">
1315
<Setter.Value>

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -390,17 +390,21 @@
390390
Icon="&#xe790;">
391391
<cc:ExCard.SideContent>
392392
<StackPanel VerticalAlignment="Center" Orientation="Horizontal">
393-
<ui:FontIcon
394-
Margin="0 2 8 0"
393+
<ui:PathIcon
394+
Width="12"
395+
Margin="0 1 8 0"
395396
VerticalAlignment="Center"
396-
FontSize="12"
397-
Glyph="&#xED66;"
397+
Data="{DynamicResource circle_half_stroke_solid}"
398+
ToolTip="{DynamicResource TypeIsDarkToolTip}"
399+
ToolTipService.InitialShowDelay="0"
398400
Visibility="{Binding SelectedTheme.IsDark, Converter={StaticResource BoolToVisibilityConverter}}" />
399401
<ui:FontIcon
400402
Margin="0 2 8 0"
401403
VerticalAlignment="Center"
402404
FontSize="12"
403405
Glyph="&#xEB42;"
406+
ToolTip="{DynamicResource TypeHasBlurToolTip}"
407+
ToolTipService.InitialShowDelay="0"
404408
Visibility="{Binding SelectedTheme.HasBlur, Converter={StaticResource BoolToVisibilityConverter}}" />
405409
<TextBlock Text="{Binding SelectedTheme.Name}" />
406410
</StackPanel>
@@ -433,17 +437,21 @@
433437
VerticalAlignment="Center"
434438
Text="{Binding Name}"
435439
TextWrapping="Wrap" />
436-
<ui:FontIcon
440+
<ui:PathIcon
441+
Width="12"
437442
Margin="8 1 0 0"
438443
VerticalAlignment="Center"
439-
FontSize="12"
440-
Glyph="&#xED66;"
444+
Data="{DynamicResource circle_half_stroke_solid}"
445+
ToolTip="{DynamicResource TypeIsDarkToolTip}"
446+
ToolTipService.InitialShowDelay="0"
441447
Visibility="{Binding IsDark, Converter={StaticResource BoolToVisibilityConverter}}" />
442448
<ui:FontIcon
443449
Margin="8 1 0 0"
444450
VerticalAlignment="Center"
445451
FontSize="12"
446452
Glyph="&#xEB42;"
453+
ToolTip="{DynamicResource TypeHasBlurToolTip}"
454+
ToolTipService.InitialShowDelay="0"
447455
Visibility="{Binding HasBlur, Converter={StaticResource BoolToVisibilityConverter}}" />
448456
</StackPanel>
449457
</Grid>

0 commit comments

Comments
 (0)