Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions src/Files.App.Controls/ThemedIcon/Styles/Icons.Misc16.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,53 @@
</Style>


<Style
x:Key="App.ThemedIcons.SetSlideshow.16"
BasedOn="{StaticResource DefaultThemedIconStyle}"
TargetType="local:ThemedIcon">


<Setter Property="IconSize" Value="16" />

<Setter Property="OutlineIconData" Value="m4,1c-1.66,0-3,1.34-3,3v8c0,1.66,1.34,3,3,3h8c1.66,0,3-1.34,3-3V4c0-1.66-1.34-3-3-3H4Zm7.71,13l-2.47-2.47c-.68-.68-1.79-.68-2.47,0l-2.47,2.47h-.29c-1.1,0-2-.9-2-2v-4h12v4c0,1.1-.9,2-2,2h-.29Zm-6,0l1.76-1.76c.29-.29.77-.29,1.06,0l1.76,1.76h-4.59Zm8.29-7h-2.79l-1.97-1.97c-.68-.68-1.79-.68-2.47,0l-1.97,1.97h-2.79v-3c0-1.1.9-2,2-2h8c1.1,0,2,.9,2,2v3Zm-7.79,0l1.26-1.26c.29-.29.77-.29,1.06,0l1.26,1.26h-3.59Zm6.79-3c0,.55-.45,1-1,1s-1-.45-1-1,.45-1,1-1,1,.45,1,1Zm-1,7.5c.55,0,1-.45,1-1s-.45-1-1-1-1,.45-1,1,.45,1,1,1Z" />
<Setter Property="FilledIconData" Value="m4,1c-1.66,0-3,1.34-3,3v3h3.29l2.47-2.47c.68-.68,1.79-.68,2.47,0l2.47,2.47h3.29v-3c0-1.66-1.34-3-3-3H4Zm11,7v4c0,1.44-1.01,2.64-2.36,2.93l-3.4-3.4c-.68-.68-1.79-.68-2.47,0l-3.4,3.4c-1.35-.29-2.36-1.49-2.36-2.93v-4h14Zm-10.29,7h6.59l-2.76-2.76c-.29-.29-.77-.29-1.06,0l-2.76,2.76Zm1-8h4.59l-1.76-1.76c-.29-.29-.77-.29-1.06,0l-1.76,1.76Zm7.79-3.5c0,.55-.45,1-1,1s-1-.45-1-1,.45-1,1-1,1,.45,1,1Zm-1,8c.55,0,1-.45,1-1s-.45-1-1-1-1,.45-1,1,.45,1,1,1Z" />


<Setter Property="Layers">
<Setter.Value>
<local:ThemedIconLayers>
<local:ThemedIconLayer
LayerSize="16"
LayerType="Alt"
Opacity="1.0"
PathData="m12,2c1.1,0,2,.9,2,2v3H2v-3c0-1.1.9-2,2-2h8Z" />
<local:ThemedIconLayer
LayerSize="16"
LayerType="Base"
Opacity="1.0"
PathData="m12,3c-.55,0-1,.45-1,1s.45,1,1,1,1-.45,1-1-.45-1-1-1Zm0-2H4c-1.66,0-3,1.34-3,3v8c0,1.66,1.34,3,3,3h8c1.66,0,3-1.34,3-3V4c0-1.66-1.34-3-3-3Zm2,11c0,1.1-.9,2-2,2H4c-1.1,0-2-.9-2-2v-4h12v4Zm-7.79-5l1.26-1.26c.29-.29.77-.29,1.06,0l1.26,1.26h-3.59Zm7.79,0h-2.79l-1.97-1.97c-.68-.68-1.79-.68-2.47,0l-1.97,1.97h-2.79v-3c0-1.1.9-2,2-2h8c1.1,0,2,.9,2,2v3Z" />
<local:ThemedIconLayer
LayerSize="16"
LayerType="Accent"
Opacity="1.0"
PathData="m6.76,11.53l-2.47,2.47h1.41l1.76-1.76c.29-.29.77-.29,1.06,0l1.76,1.76h1.41l-2.47-2.47c-.68-.68-1.79-.68-2.47,0Zm5.24-2.03c-.55,0-1,.45-1,1s.45,1,1,1,1-.45,1-1-.45-1-1-1Z" />
<local:ThemedIconLayer
LayerSize="16"
LayerType="Accent"
Opacity="0.6"
PathData="m7.3,11.79c.39-.38,1.01-.38,1.4,0l2.24,2.21h-5.89l2.24-2.21Z" />
<local:ThemedIconLayer
LayerSize="16"
LayerType="Accent"
Opacity="0.15"
PathData="m14,12c0,1.1-.9,2-2,2H4c-1.1,0-2-.9-2-2v-4h12v4Z" />
</local:ThemedIconLayers>
</Setter.Value>
</Setter>

</Style>


<Style
x:Key="App.ThemedIcons.StatusCenter"
BasedOn="{StaticResource DefaultThemedIconStyle}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public override string Description
=> Strings.SetAsSlideshowBackgroundDescription.GetLocalizedResource();

public override RichGlyph Glyph
=> new("\uE91B");
=> new(themedIconStyle: "App.ThemedIcons.SetSlideshow.16");

public override bool IsExecutable =>
base.IsExecutable &&
Expand Down
5 changes: 3 additions & 2 deletions src/Files.App/UserControls/Toolbar.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -335,11 +335,12 @@
Width="Auto"
MinWidth="40"
Command="{x:Bind Commands.SetAsSlideshowBackground}"
Icon="{x:Bind Commands.SetAsSlideshowBackground.FontIcon}"
Label="{x:Bind Commands.SetAsSlideshowBackground.Label}"
LabelPosition="Default"
ToolTipService.ToolTip="{x:Bind Commands.SetAsSlideshowBackground.LabelWithHotKey, Mode=OneWay}"
Visibility="{x:Bind Commands.SetAsSlideshowBackground.IsExecutable, Mode=OneWay}" />
Visibility="{x:Bind Commands.SetAsSlideshowBackground.IsExecutable, Mode=OneWay}">
<controls:ThemedIcon Style="{x:Bind Commands.SetAsSlideshowBackground.ThemedIconStyle}" />
</AppBarButton>

<!-- Install Inf -->
<AppBarButton
Expand Down
2 changes: 1 addition & 1 deletion tests/Files.App.UITests/Views/ThemedIconPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<ResourceDictionary>
<Style
x:Key="IconTest"
BasedOn="{StaticResource App.ThemedIcons.Actions.FontInstall}"
BasedOn="{StaticResource App.ThemedIcons.SetSlideshow.16}"
TargetType="controls:ThemedIcon" />
</ResourceDictionary>
</Page.Resources>
Expand Down
Loading