Skip to content

Commit 7ca7ffd

Browse files
authored
Code Quality: Added Shelf Icon (#16674)
1 parent 16f39b6 commit 7ca7ffd

File tree

2 files changed

+33
-1
lines changed

2 files changed

+33
-1
lines changed

src/Files.App.Controls/ThemedIcon/Styles/Icons.Misc16.xaml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,4 +271,36 @@
271271
</Setter>
272272
</Style>
273273

274+
275+
<Style
276+
x:Key="App.ThemedIcons.Shelf"
277+
BasedOn="{StaticResource DefaultThemedIconStyle}"
278+
TargetType="local:ThemedIcon">
279+
280+
281+
<Setter Property="IconSize" Value="16" />
282+
283+
<Setter Property="OutlineIconData" Value="m4.15,8.15c-.2.2-.2.51,0,.71l3,3c.2.2.51.2.71,0l3-3c.2-.2.2-.51,0-.71-.2-.2-.51-.2-.71,0l-2.15,2.15V.5C8,.22,7.78,0,7.5,0s-.5.22-.5.5v9.79l-2.15-2.15c-.2-.2-.51-.2-.71,0ZM9,1.15v1.02c2.87.68,5,3.25,5,6.33,0,3.59-2.91,6.5-6.5,6.5S1,12.09,1,8.5c0-3.07,2.13-5.65,5-6.33v-1.02C2.58,1.85,0,4.87,0,8.5c0,4.14,3.36,7.5,7.5,7.5s7.5-3.36,7.5-7.5c0-3.63-2.58-6.66-6-7.35Z" />
284+
<Setter Property="FilledIconData" Value="m4.2,8.25c-.28.31-.26.78.05,1.06l2.75,2.5c.29.26.72.26,1.01,0l2.75-2.5c.31-.28.33-.75.05-1.06-.28-.31-.75-.33-1.06-.05l-1.5,1.36V.75C8.25.34,7.91,0,7.5,0s-.75.34-.75.75v8.8l-1.5-1.36c-.31-.28-.78-.26-1.06.05ZM9.25,1.21v1.55c2.46.75,4.25,3.04,4.25,5.74,0,3.31-2.69,6-6,6S1.5,11.81,1.5,8.5c0-2.7,1.79-4.99,4.25-5.74v-1.55C2.45,1.99,0,4.96,0,8.5c0,4.14,3.36,7.5,7.5,7.5s7.5-3.36,7.5-7.5c0-3.54-2.45-6.51-5.75-7.29Z" />
285+
286+
<Setter Property="Layers">
287+
<Setter.Value>
288+
<local:ThemedIconLayers>
289+
<local:ThemedIconLayer
290+
LayerSize="16"
291+
LayerType="Alt"
292+
PathData="m6,1.66v6.22l-.44-.44c-.59-.59-1.54-.59-2.12,0-.59.59-.59,1.54,0,2.12l3,3c.59.59,1.54.59,2.12,0l3-3c.59-.59.59-1.54,0-2.12-.59-.59-1.54-.59-2.12,0l-.44.44V1.66c3.15.69,5.5,3.49,5.5,6.84,0,3.87-3.13,7-7,7S.5,12.37.5,8.5C.5,5.15,2.85,2.35,6,1.66Z" />
293+
<local:ThemedIconLayer
294+
LayerSize="16"
295+
LayerType="Base"
296+
PathData="m6,1.15C2.58,1.85,0,4.87,0,8.5c0,4.14,3.36,7.5,7.5,7.5s7.5-3.36,7.5-7.5c0-3.63-2.58-6.66-6-7.35v1.02c2.87.68,5,3.25,5,6.33,0,3.59-2.91,6.5-6.5,6.5S1,12.09,1,8.5c0-3.07,2.13-5.65,5-6.33v-1.02Z" />
297+
<local:ThemedIconLayer
298+
LayerSize="16"
299+
LayerType="Accent"
300+
PathData="m7.5,0c.28,0,.5.22.5.5v9.79l2.15-2.15c.2-.2.51-.2.71,0,.2.2.2.51,0,.71l-3,3c-.2.2-.51.2-.71,0l-3-3c-.2-.2-.2-.51,0-.71.2-.2.51-.2.71,0l2.15,2.15V.5c0-.28.22-.5.5-.5Z" />
301+
</local:ThemedIconLayers>
302+
</Setter.Value>
303+
</Setter>
304+
</Style>
305+
274306
</ResourceDictionary>

tests/Files.App.UITests/Views/ThemedIconPage.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ResourceDictionary>
1414
<Style
1515
x:Key="IconTest"
16-
BasedOn="{StaticResource App.ThemedIcons.AltDataStream}"
16+
BasedOn="{StaticResource App.ThemedIcons.Shelf}"
1717
TargetType="controls:ThemedIcon">
1818
<Setter Property="IconSize" Value="16" />
1919
<Setter Property="Width" Value="16" />

0 commit comments

Comments
 (0)