Skip to content

Commit 5557b23

Browse files
yaira2yaira2
authored
Feature: Updated layout icons in the toolbar (#14846)
1 parent 1d7ae05 commit 5557b23

File tree

3 files changed

+269
-39
lines changed

3 files changed

+269
-39
lines changed

‎src/Files.App/Actions/Display/LayoutAction.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public override string Description
1515
=> "LayoutDetailsDescription".GetLocalizedResource();
1616

1717
public override RichGlyph Glyph
18-
=> new(opacityStyle: "ColorIconDetailsLayout");
18+
=> new(opacityStyle: "Icons.DetailsLayout.16x16");
1919

2020
public override HotKey HotKey
2121
=> new(Keys.Number1, KeyModifiers.CtrlShift);
@@ -33,7 +33,7 @@ public override string Description
3333
=> "LayoutListDescription".GetLocalizedResource();
3434

3535
public override RichGlyph Glyph
36-
=> new(opacityStyle: "ColorIconListLayout");
36+
=> new(opacityStyle: "Icons.ListLayout.16x16");
3737

3838
public override HotKey HotKey
3939
=> new(Keys.Number2, KeyModifiers.CtrlShift);
@@ -51,7 +51,7 @@ public override string Description
5151
=> "LayoutTilesDescription".GetLocalizedResource();
5252

5353
public override RichGlyph Glyph
54-
=> new(opacityStyle: "ColorIconTilesLayout");
54+
=> new(opacityStyle: "Icons.TilesLayout.16x16");
5555

5656
public override HotKey HotKey
5757
=> new(Keys.Number3, KeyModifiers.CtrlShift);
@@ -69,7 +69,7 @@ public override string Description
6969
=> "LayoutGridescription".GetLocalizedResource();
7070

7171
public override RichGlyph Glyph
72-
=> new(opacityStyle: "ColorIconGridLayout");
72+
=> new(opacityStyle: "Icons.GridLayout.16x16");
7373

7474
public override HotKey HotKey
7575
=> new(Keys.Number4, KeyModifiers.CtrlShift);
@@ -87,7 +87,7 @@ public override string Description
8787
=> "LayoutColumnsDescription".GetLocalizedResource();
8888

8989
public override RichGlyph Glyph
90-
=> new(opacityStyle: "ColorIconColumnsLayout");
90+
=> new(opacityStyle: "Icons.ColumnsLayout.16x16");
9191

9292
public override HotKey HotKey
9393
=> new(Keys.Number5, KeyModifiers.CtrlShift);

‎src/Files.App/ResourceDictionaries/PathIcons.xaml

Lines changed: 240 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,7 +1713,40 @@
17131713
</Setter>
17141714
</Style>
17151715

1716-
<Style x:Key="ColorIconColumnsLayout" TargetType="local:OpacityIcon">
1716+
<Style x:Key="Icons.ColumnsLayout.16x16" TargetType="local:OpacityIcon">
1717+
<Setter Property="Template">
1718+
<Setter.Value>
1719+
<ControlTemplate>
1720+
<Grid>
1721+
<Canvas
1722+
Width="16"
1723+
Height="16"
1724+
HorizontalAlignment="Center"
1725+
VerticalAlignment="Center">
1726+
<Path
1727+
x:Name="Path1"
1728+
Data="M3 2.5C2.17157 2.5 1.5 3.17157 1.5 4V12C1.5 12.8284 2.17157 13.5 3 13.5H13C13.8284 13.5 14.5 12.8284 14.5 12V4C14.5 3.17157 13.8284 2.5 13 2.5H3Z"
1729+
Fill="{ThemeResource Local.IconAltBrush}" />
1730+
<Path
1731+
x:Name="Path2"
1732+
Data="M1 4C1 2.89543 1.89543 2 3 2H13C14.1046 2 15 2.89543 15 4V12C15 13.1046 14.1046 14 13 14H3C1.89543 14 1 13.1046 1 12V4ZM3 3C2.44772 3 2 3.44772 2 4V12C2 12.5523 2.44772 13 3 13H13C13.5523 13 14 12.5523 14 12V4C14 3.44772 13.5523 3 13 3H3ZM5.5 4C5.77614 4 6 4.22386 6 4.5V11.5C6 11.7761 5.77614 12 5.5 12C5.22386 12 5 11.7761 5 11.5V4.5C5 4.22386 5.22386 4 5.5 4ZM11 4.5C11 4.22386 10.7761 4 10.5 4C10.2239 4 10 4.22386 10 4.5V11.5C10 11.7761 10.2239 12 10.5 12C10.7761 12 11 11.7761 11 11.5V4.5Z"
1733+
Fill="{ThemeResource Local.IconBaseBrush}" />
1734+
</Canvas>
1735+
1736+
<VisualStateManager.VisualStateGroups>
1737+
<VisualStateGroup>
1738+
<VisualState x:Name="Normal" />
1739+
<VisualState x:Name="Disabled" />
1740+
<VisualState x:Name="Selected" />
1741+
</VisualStateGroup>
1742+
</VisualStateManager.VisualStateGroups>
1743+
</Grid>
1744+
</ControlTemplate>
1745+
</Setter.Value>
1746+
</Setter>
1747+
</Style>
1748+
1749+
<Style x:Key="Icons.ColumnsLayout.28x28" TargetType="local:OpacityIcon">
17171750
<Setter Property="Template">
17181751
<Setter.Value>
17191752
<ControlTemplate>
@@ -1761,7 +1794,66 @@
17611794
</Setter>
17621795
</Style>
17631796

1764-
<Style x:Key="ColorIconListLayout" TargetType="local:OpacityIcon">
1797+
<Style x:Key="Icons.ListLayout.16x16" TargetType="local:OpacityIcon">
1798+
<Setter Property="Template">
1799+
<Setter.Value>
1800+
<ControlTemplate>
1801+
<Grid>
1802+
<Canvas
1803+
Width="16"
1804+
Height="16"
1805+
HorizontalAlignment="Center"
1806+
VerticalAlignment="Center">
1807+
<Path
1808+
x:Name="Path1"
1809+
Data="M4.33141 3.79527C4.14197 3.62688 3.85649 3.62688 3.66705 3.79527L1.94907 5.32236C1.84715 5.41296 1.78665 5.54126 1.78159 5.67754C1.77654 5.81381 1.82737 5.94624 1.9223 6.04414C2.19433 6.32468 2.57674 6.5 2.99922 6.5H4.99922C5.42171 6.5 5.80412 6.32468 6.07616 6.04413C6.17109 5.94623 6.22191 5.8138 6.21686 5.67753C6.2118 5.54125 6.15131 5.41296 6.04939 5.32236L4.33141 3.79527Z"
1810+
Fill="{ThemeResource Local.IconBaseBrush}"
1811+
Opacity=".30" />
1812+
<Path
1813+
x:Name="Path2"
1814+
Data="M4.33141 11.7953C4.14197 11.6269 3.85649 11.6269 3.66705 11.7953L1.94907 13.3224C1.84715 13.413 1.78665 13.5413 1.78159 13.6775C1.77654 13.8138 1.82737 13.9462 1.9223 14.0441C2.19433 14.3247 2.57674 14.5 2.99923 14.5H4.99923C5.42171 14.5 5.80413 14.3247 6.07616 14.0441C6.17109 13.9462 6.22192 13.8138 6.21686 13.6775C6.21181 13.5413 6.15131 13.413 6.04939 13.3224L4.33141 11.7953Z"
1815+
Fill="{ThemeResource Local.IconBaseBrush}"
1816+
Opacity=".30" />
1817+
<Path
1818+
x:Name="Path3"
1819+
Data="M3 1.5C2.17157 1.5 1.5 2.17157 1.5 3V4.6088C1.5 4.8057 1.61556 4.98427 1.79517 5.06492C1.97479 5.14558 2.18502 5.11332 2.33218 4.98251L4.00001 3.5L5.66782 4.9825C5.81498 5.11331 6.02521 5.14558 6.20483 5.06492C6.38444 4.98426 6.5 4.80569 6.5 4.6088V3C6.5 2.17157 5.82843 1.5 5 1.5H3Z"
1820+
Fill="{ThemeResource Local.IconAltBrush}" />
1821+
<Path
1822+
x:Name="Path4"
1823+
Data="M3 9.5C2.17157 9.5 1.5 10.1716 1.5 11V12.6088C1.5 12.8057 1.61556 12.9843 1.79517 13.0649C1.97479 13.1456 2.18502 13.1133 2.33218 12.9825L4.00001 11.5L5.66782 12.9825C5.81498 13.1133 6.02521 13.1456 6.20483 13.0649C6.38444 12.9843 6.5 12.8057 6.5 12.6088V11C6.5 10.1716 5.82843 9.5 5 9.5H3Z"
1824+
Fill="{ThemeResource Local.IconAltBrush}" />
1825+
<Path
1826+
x:Name="Path5"
1827+
Data="M1 3C1 1.89543 1.89543 1 3 1H5C6.10457 1 7 1.89543 7 3V5C7 6.10457 6.10457 7 5 7H3C1.89543 7 1 6.10457 1 5V3ZM3 2C2.44772 2 2 2.44772 2 3V4.6088L3.66782 3.1263C3.85727 2.9579 4.14274 2.9579 4.33219 3.1263L6 4.6088V3C6 2.44772 5.55228 2 5 2H3ZM3 6C2.71829 6 2.46378 5.88351 2.28203 5.69607L4.00001 4.16898L5.71798 5.69607C5.53622 5.88351 5.28172 6 5 6H3Z"
1828+
Fill="{ThemeResource Local.IconBaseBrush}" />
1829+
<Path
1830+
x:Name="Path6"
1831+
Data="M1 11C1 9.89543 1.89543 9 3 9H5C6.10457 9 7 9.89543 7 11V13C7 14.1046 6.10457 15 5 15H3C1.89543 15 1 14.1046 1 13V11ZM3 10C2.44772 10 2 10.4477 2 11V12.6088L3.66782 11.1263C3.85727 10.9579 4.14274 10.9579 4.33219 11.1263L6 12.6088V11C6 10.4477 5.55228 10 5 10H3ZM5.71798 13.6961L4.00001 12.169L2.28203 13.6961C2.46378 13.8835 2.71829 14 3 14H5C5.28172 14 5.53622 13.8835 5.71798 13.6961Z"
1832+
Fill="{ThemeResource Local.IconBaseBrush}" />
1833+
<Path
1834+
x:Name="Path7"
1835+
Data="M9.5 4C9.22386 4 9 4.22386 9 4.5C9 4.77614 9.22386 5 9.5 5H14.5C14.7761 5 15 4.77614 15 4.5C15 4.22386 14.7761 4 14.5 4H9.5Z"
1836+
Fill="{ThemeResource Local.IconBaseBrush}" />
1837+
<Path
1838+
x:Name="Path8"
1839+
Data="M9 11.5C9 11.2239 9.22386 11 9.5 11H14.5C14.7761 11 15 11.2239 15 11.5C15 11.7761 14.7761 12 14.5 12H9.5C9.22386 12 9 11.7761 9 11.5Z"
1840+
Fill="{ThemeResource Local.IconBaseBrush}" />
1841+
</Canvas>
1842+
1843+
<VisualStateManager.VisualStateGroups>
1844+
<VisualStateGroup>
1845+
<VisualState x:Name="Normal" />
1846+
<VisualState x:Name="Disabled" />
1847+
<VisualState x:Name="Selected" />
1848+
</VisualStateGroup>
1849+
</VisualStateManager.VisualStateGroups>
1850+
</Grid>
1851+
</ControlTemplate>
1852+
</Setter.Value>
1853+
</Setter>
1854+
</Style>
1855+
1856+
<Style x:Key="Icons.ListLayout.28x28" TargetType="local:OpacityIcon">
17651857
<Setter Property="Template">
17661858
<Setter.Value>
17671859
<ControlTemplate>
@@ -1819,7 +1911,57 @@
18191911
</Setter>
18201912
</Style>
18211913

1822-
<Style x:Key="ColorIconTilesLayout" TargetType="local:OpacityIcon">
1914+
<Style x:Key="Icons.TilesLayout.16x16" TargetType="local:OpacityIcon">
1915+
<Setter Property="Template">
1916+
<Setter.Value>
1917+
<ControlTemplate>
1918+
<Grid>
1919+
<Canvas
1920+
Width="16"
1921+
Height="16"
1922+
HorizontalAlignment="Center"
1923+
VerticalAlignment="Center">
1924+
<Path
1925+
x:Name="Path1"
1926+
Data="M4.88315 8.88388C4.395 8.39572 3.60354 8.39572 3.11538 8.88388L1.38669 10.6126C1.26035 10.7389 1.21103 10.9231 1.25731 11.0957C1.3036 11.2682 1.43846 11.403 1.61107 11.4491C1.73544 11.4824 1.86568 11.5 1.99927 11.5H5.99927C6.13285 11.5 6.26309 11.4824 6.38746 11.4491C6.56007 11.403 6.69493 11.2682 6.74122 11.0957C6.78751 10.9231 6.73818 10.7389 6.61184 10.6126L4.88315 8.88388Z"
1927+
Fill="{ThemeResource Local.IconBaseBrush}"
1928+
Opacity=".30" />
1929+
<Path
1930+
x:Name="Path2"
1931+
Data="M2 4.5C1.17157 4.5 0.5 5.17157 0.5 6V10C0.5 10.1336 0.517586 10.2638 0.550846 10.3882C0.597006 10.5608 0.731767 10.6957 0.904344 10.742C1.07692 10.7882 1.26108 10.7389 1.38743 10.6126L3.11612 8.88388C3.60427 8.39573 4.39573 8.39573 4.88388 8.88388L6.61258 10.6126C6.73892 10.7389 6.92308 10.7882 7.09566 10.742C7.26823 10.6957 7.40299 10.5608 7.44915 10.3882C7.48241 10.2638 7.5 10.1336 7.5 10V6C7.5 5.17157 6.82843 4.5 6 4.5H2Z"
1932+
Fill="{ThemeResource Local.IconAltBrush}" />
1933+
<Path
1934+
x:Name="Path3"
1935+
Data="M6.25 6.5C6.25 6.91421 5.91421 7.25 5.5 7.25C5.08579 7.25 4.75 6.91421 4.75 6.5C4.75 6.08579 5.08579 5.75 5.5 5.75C5.91421 5.75 6.25 6.08579 6.25 6.5Z"
1936+
Fill="{ThemeResource Local.IconBaseBrush}" />
1937+
<Path
1938+
x:Name="Path4"
1939+
Data="M2 4C0.895431 4 0 4.89543 0 6V10C0 11.1046 0.895431 12 2 12H6C7.10457 12 8 11.1046 8 10V6C8 4.89543 7.10457 4 6 4H2ZM1 6C1 5.44772 1.44772 5 2 5H6C6.55228 5 7 5.44772 7 6V10C7 10.0896 6.98822 10.1764 6.96613 10.259L5.23744 8.53033C4.55402 7.84691 3.44598 7.84691 2.76256 8.53033L1.03387 10.259C1.01178 10.1764 1 10.0896 1 10V6ZM1.74098 10.9661L3.46967 9.23744C3.76256 8.94454 4.23744 8.94454 4.53033 9.23744L6.25902 10.9661C6.17641 10.9882 6.08958 11 6 11H2C1.91042 11 1.82359 10.9882 1.74098 10.9661Z"
1940+
Fill="{ThemeResource Local.IconBaseBrush}" />
1941+
<Path
1942+
x:Name="Path5"
1943+
Data="M10 6.5C10 6.22386 10.2239 6 10.5 6H15.5C15.7761 6 16 6.22386 16 6.5C16 6.77614 15.7761 7 15.5 7H10.5C10.2239 7 10 6.77614 10 6.5Z"
1944+
Fill="{ThemeResource Local.IconBaseBrush}" />
1945+
<Path
1946+
x:Name="Path6"
1947+
Data="M10 9.5C10 9.22386 10.2239 9 10.5 9H15.5C15.7761 9 16 9.22386 16 9.5C16 9.77614 15.7761 10 15.5 10H10.5C10.2239 10 10 9.77614 10 9.5Z"
1948+
Fill="{ThemeResource Local.IconBaseBrush}" />
1949+
</Canvas>
1950+
1951+
<VisualStateManager.VisualStateGroups>
1952+
<VisualStateGroup>
1953+
<VisualState x:Name="Normal" />
1954+
<VisualState x:Name="Disabled" />
1955+
<VisualState x:Name="Selected" />
1956+
</VisualStateGroup>
1957+
</VisualStateManager.VisualStateGroups>
1958+
</Grid>
1959+
</ControlTemplate>
1960+
</Setter.Value>
1961+
</Setter>
1962+
</Style>
1963+
1964+
<Style x:Key="Icons.TilesLayout.28x28" TargetType="local:OpacityIcon">
18231965
<Setter Property="Template">
18241966
<Setter.Value>
18251967
<ControlTemplate>
@@ -1867,7 +2009,66 @@
18672009
</Setter>
18682010
</Style>
18692011

1870-
<Style x:Key="ColorIconGridLayout" TargetType="local:OpacityIcon">
2012+
<Style x:Key="Icons.GridLayout.16x16" TargetType="local:OpacityIcon">
2013+
<Setter Property="Template">
2014+
<Setter.Value>
2015+
<ControlTemplate>
2016+
<Grid>
2017+
<Canvas
2018+
Width="16"
2019+
Height="16"
2020+
HorizontalAlignment="Center"
2021+
VerticalAlignment="Center">
2022+
<Path
2023+
x:Name="Path1"
2024+
Data="M4.33141 5.79527C4.14197 5.62688 3.85649 5.62688 3.66705 5.79527L1.94907 7.32236C1.84715 7.41296 1.78665 7.54126 1.78159 7.67754C1.77654 7.81381 1.82737 7.94624 1.9223 8.04414C2.19433 8.32468 2.57674 8.5 2.99922 8.5H4.99922C5.42171 8.5 5.80412 8.32468 6.07616 8.04413C6.17109 7.94623 6.22191 7.8138 6.21686 7.67753C6.2118 7.54125 6.15131 7.41296 6.04939 7.32236L4.33141 5.79527Z"
2025+
Fill="{ThemeResource Local.IconBaseBrush}"
2026+
Opacity=".30" />
2027+
<Path
2028+
x:Name="Path2"
2029+
Data="M12.3314 5.79527C12.142 5.62688 11.8565 5.62688 11.667 5.79527L9.94907 7.32236C9.84715 7.41296 9.78665 7.54126 9.7816 7.67754C9.77654 7.81381 9.82737 7.94624 9.9223 8.04414C10.1943 8.32468 10.5767 8.5 10.9992 8.5H12.9992C13.4217 8.5 13.8041 8.32468 14.0762 8.04413C14.1711 7.94623 14.2219 7.8138 14.2169 7.67753C14.2118 7.54125 14.1513 7.41296 14.0494 7.32236L12.3314 5.79527Z"
2030+
Fill="{ThemeResource Local.IconBaseBrush}"
2031+
Opacity=".30" />
2032+
<Path
2033+
x:Name="Path3"
2034+
Data="M3 3.5C2.17157 3.5 1.5 4.17157 1.5 5V6.6088C1.5 6.8057 1.61556 6.98427 1.79517 7.06492C1.97479 7.14558 2.18502 7.11332 2.33218 6.98251L4.00001 5.5L5.66782 6.9825C5.81498 7.11331 6.02521 7.14558 6.20483 7.06492C6.38444 6.98426 6.5 6.80569 6.5 6.6088V5C6.5 4.17157 5.82843 3.5 5 3.5H3Z"
2035+
Fill="{ThemeResource Local.IconAltBrush}" />
2036+
<Path
2037+
x:Name="Path4"
2038+
Data="M11 3.5C10.1716 3.5 9.5 4.17157 9.5 5V6.60881C9.5 6.8057 9.61555 6.98427 9.79517 7.06493C9.97479 7.14558 10.185 7.11332 10.3322 6.98251L12 5.5L13.6678 6.9825C13.815 7.11331 14.0252 7.14557 14.2048 7.06491C14.3844 6.98426 14.5 6.80569 14.5 6.60879V5C14.5 4.17157 13.8284 3.5 13 3.5H11Z"
2039+
Fill="{ThemeResource Local.IconAltBrush}" />
2040+
<Path
2041+
x:Name="Path5"
2042+
Data="M1 5C1 3.89543 1.89543 3 3 3H5C6.10457 3 7 3.89543 7 5V7C7 8.10457 6.10457 9 5 9H3C1.89543 9 1 8.10457 1 7V5ZM3 4C2.44772 4 2 4.44772 2 5V6.6088L3.66782 5.1263C3.85727 4.9579 4.14274 4.9579 4.33219 5.1263L6 6.6088V5C6 4.44772 5.55228 4 5 4H3ZM3 8C2.71829 8 2.46378 7.88351 2.28203 7.69607L4.00001 6.16898L5.71798 7.69607C5.53622 7.88351 5.28172 8 5 8H3Z"
2043+
Fill="{ThemeResource Local.IconBaseBrush}" />
2044+
<Path
2045+
x:Name="Path6"
2046+
Data="M9 5C9 3.89543 9.89543 3 11 3H13C14.1046 3 15 3.89543 15 5V7C15 8.10457 14.1046 9 13 9H11C9.89543 9 9 8.10457 9 7V5ZM11 4C10.4477 4 10 4.44772 10 5V6.60881L11.6678 5.1263C11.8573 4.9579 12.1427 4.9579 12.3322 5.1263L14 6.60879V5C14 4.44772 13.5523 4 13 4H11ZM13.718 7.69607L12 6.16898L10.282 7.69607C10.4638 7.88351 10.7183 8 11 8H13C13.2817 8 13.5362 7.88351 13.718 7.69607Z"
2047+
Fill="{ThemeResource Local.IconBaseBrush}" />
2048+
<Path
2049+
x:Name="Path7"
2050+
Data="M1.5 12C1.22386 12 1 12.2239 1 12.5C1 12.7761 1.22386 13 1.5 13H6.5C6.77614 13 7 12.7761 7 12.5C7 12.2239 6.77614 12 6.5 12H1.5Z"
2051+
Fill="{ThemeResource Local.IconBaseBrush}" />
2052+
<Path
2053+
x:Name="Path8"
2054+
Data="M9 12.5C9 12.2239 9.22386 12 9.5 12H14.5C14.7761 12 15 12.2239 15 12.5C15 12.7761 14.7761 13 14.5 13H9.5C9.22386 13 9 12.7761 9 12.5Z"
2055+
Fill="{ThemeResource Local.IconBaseBrush}" />
2056+
</Canvas>
2057+
2058+
<VisualStateManager.VisualStateGroups>
2059+
<VisualStateGroup>
2060+
<VisualState x:Name="Normal" />
2061+
<VisualState x:Name="Disabled" />
2062+
<VisualState x:Name="Selected" />
2063+
</VisualStateGroup>
2064+
</VisualStateManager.VisualStateGroups>
2065+
</Grid>
2066+
</ControlTemplate>
2067+
</Setter.Value>
2068+
</Setter>
2069+
</Style>
2070+
2071+
<Style x:Key="Icons.GridLayout.28x28" TargetType="local:OpacityIcon">
18712072
<Setter Property="Template">
18722073
<Setter.Value>
18732074
<ControlTemplate>
@@ -1905,7 +2106,36 @@
19052106
</Setter>
19062107
</Style>
19072108

1908-
<Style x:Key="ColorIconDetailsLayout" TargetType="local:OpacityIcon">
2109+
<Style x:Key="Icons.DetailsLayout.16x16" TargetType="local:OpacityIcon">
2110+
<Setter Property="Template">
2111+
<Setter.Value>
2112+
<ControlTemplate>
2113+
<Grid>
2114+
<Canvas
2115+
Width="16"
2116+
Height="16"
2117+
HorizontalAlignment="Center"
2118+
VerticalAlignment="Center">
2119+
<Path
2120+
Name="Path1"
2121+
Data="M6.5 3H1.5C1.22386 3 1 3.22386 1 3.5C1 3.77614 1.22386 4 1.5 4H6.5C6.77614 4 7 3.77614 7 3.5C7 3.22386 6.77614 3 6.5 3ZM9.5 3H14.5C14.7761 3 15 3.22386 15 3.5C15 3.77614 14.7761 4 14.5 4H9.5C9.22386 4 9 3.77614 9 3.5C9 3.22386 9.22386 3 9.5 3ZM1.5 6H6.5C6.77614 6 7 6.22386 7 6.5C7 6.77614 6.77614 7 6.5 7H1.5C1.22386 7 1 6.77614 1 6.5C1 6.22386 1.22386 6 1.5 6ZM14.5 6H9.5C9.22386 6 9 6.22386 9 6.5C9 6.77614 9.22386 7 9.5 7H14.5C14.7761 7 15 6.77614 15 6.5C15 6.22386 14.7761 6 14.5 6ZM9.5 9H14.5C14.7761 9 15 9.22386 15 9.5C15 9.77614 14.7761 10 14.5 10H9.5C9.22386 10 9 9.77614 9 9.5C9 9.22386 9.22386 9 9.5 9ZM6.5 9H1.5C1.22386 9 1 9.22386 1 9.5C1 9.77614 1.22386 10 1.5 10H6.5C6.77614 10 7 9.77614 7 9.5C7 9.22386 6.77614 9 6.5 9ZM1.5 12H6.5C6.77614 12 7 12.2239 7 12.5C7 12.7761 6.77614 13 6.5 13H1.5C1.22386 13 1 12.7761 1 12.5C1 12.2239 1.22386 12 1.5 12ZM14.5 12H9.5C9.22386 12 9 12.2239 9 12.5C9 12.7761 9.22386 13 9.5 13H14.5C14.7761 13 15 12.7761 15 12.5C15 12.2239 14.7761 12 14.5 12Z"
2122+
Fill="{ThemeResource Local.IconBaseBrush}" />
2123+
</Canvas>
2124+
2125+
<VisualStateManager.VisualStateGroups>
2126+
<VisualStateGroup>
2127+
<VisualState x:Name="Normal" />
2128+
<VisualState x:Name="Disabled" />
2129+
<VisualState x:Name="Selected" />
2130+
</VisualStateGroup>
2131+
</VisualStateManager.VisualStateGroups>
2132+
</Grid>
2133+
</ControlTemplate>
2134+
</Setter.Value>
2135+
</Setter>
2136+
</Style>
2137+
2138+
<Style x:Key="Icons.DetailsLayout.28x28" TargetType="local:OpacityIcon">
19092139
<Setter Property="Template">
19102140
<Setter.Value>
19112141
<ControlTemplate>
@@ -1938,7 +2168,7 @@
19382168
</Setter>
19392169
</Style>
19402170

1941-
<Style x:Key="ColorIconLayoutSizesCompact" TargetType="local:OpacityIcon">
2171+
<Style x:Key="Icons.LayoutSizesCompact.28x28" TargetType="local:OpacityIcon">
19422172
<Setter Property="Template">
19432173
<Setter.Value>
19442174
<ControlTemplate>
@@ -2022,7 +2252,7 @@
20222252
</Setter>
20232253
</Style>
20242254

2025-
<Style x:Key="ColorIconLayoutSizesSmall" TargetType="local:OpacityIcon">
2255+
<Style x:Key="Icons.LayoutSizesSmall.28x28" TargetType="local:OpacityIcon">
20262256
<Setter Property="Template">
20272257
<Setter.Value>
20282258
<ControlTemplate>
@@ -2087,7 +2317,7 @@
20872317
</Setter>
20882318
</Style>
20892319

2090-
<Style x:Key="ColorIconLayoutSizesMedium" TargetType="local:OpacityIcon">
2320+
<Style x:Key="Icons.LayoutSizesMedium.28x28" TargetType="local:OpacityIcon">
20912321
<Setter Property="Template">
20922322
<Setter.Value>
20932323
<ControlTemplate>
@@ -2153,7 +2383,7 @@
21532383
</Setter>
21542384
</Style>
21552385

2156-
<Style x:Key="ColorIconLayoutSizesLarge" TargetType="local:OpacityIcon">
2386+
<Style x:Key="Icons.LayoutSizesLarge.28x28" TargetType="local:OpacityIcon">
21572387
<Setter Property="Template">
21582388
<Setter.Value>
21592389
<ControlTemplate>
@@ -2213,7 +2443,7 @@
22132443
</Setter>
22142444
</Style>
22152445

2216-
<Style x:Key="ColorIconLayoutSizesExtraLarge" TargetType="local:OpacityIcon">
2446+
<Style x:Key="Icons.LayoutSizesExtraLarge.28x28" TargetType="local:OpacityIcon">
22172447
<Setter Property="Template">
22182448
<Setter.Value>
22192449
<ControlTemplate>

0 commit comments

Comments
 (0)