Skip to content

Commit d1bdd2e

Browse files
authored
Feature: Updated icons in the Tag column in the Details layout (#13060)
1 parent 50269c8 commit d1bdd2e

File tree

2 files changed

+20
-15
lines changed

2 files changed

+20
-15
lines changed

src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,40 +1099,45 @@
10991099
<DataTemplate x:DataType="filetags:TagViewModel">
11001100
<UserControl PointerEntered="FileTag_PointerEntered" PointerExited="FileTag_PointerExited">
11011101
<StackPanel
1102+
x:Name="TagPill"
11021103
Height="24"
11031104
Padding="8,0"
11041105
HorizontalAlignment="Left"
11051106
x:Phase="2"
1106-
BorderBrush="{x:Bind Color, Mode=OneWay, Converter={StaticResource StringToBrushConverter}}"
1107-
BorderThickness="1"
11081107
CornerRadius="12"
11091108
Orientation="Horizontal"
1109+
Spacing="8"
11101110
Tapped="TagItem_Tapped"
11111111
ToolTipService.ToolTip="{x:Bind Name, Mode=OneWay}">
1112-
<FontIcon
1113-
x:Name="TagIcon"
1114-
FontSize="12"
1115-
Foreground="{x:Bind Color, Mode=OneWay, Converter={StaticResource StringToBrushConverter}}"
1116-
Glyph="&#xE8EC;"
1117-
Tapped="TagIcon_Tapped"
1118-
ToolTipService.ToolTip="{helpers:ResourceString Name=Remove}" />
1112+
<!-- Tag icon -->
1113+
<PathIcon
1114+
VerticalAlignment="Center"
1115+
Data="{StaticResource ColorIconFilledTag}"
1116+
Foreground="{x:Bind Color, Mode=OneWay, Converter={StaticResource StringToBrushConverter}}" />
1117+
<!-- Tag name -->
11191118
<TextBlock
11201119
MaxWidth="200"
1121-
Padding="8,0,0,0"
11221120
VerticalAlignment="Center"
1123-
FontSize="12"
1124-
LineHeight="18"
11251121
Style="{StaticResource ColumnContentTextBlock}"
11261122
Text="{x:Bind Name, Mode=OneWay}"
11271123
TextTrimming="CharacterEllipsis" />
1128-
1124+
<!-- Remove tag icon -->
1125+
<FontIcon
1126+
x:Name="RemoveTagIcon"
1127+
VerticalAlignment="Center"
1128+
FontSize="12"
1129+
Glyph="&#xE711;"
1130+
Tapped="RemoveTagIcon_Tapped"
1131+
ToolTipService.ToolTip="{helpers:ResourceString Name=Remove}"
1132+
Visibility="Collapsed" />
11291133
<VisualStateManager.VisualStateGroups>
11301134
<VisualStateGroup x:Name="CommonStates">
11311135
<VisualState x:Name="Normal" />
11321136

11331137
<VisualState x:Name="PointerOver">
11341138
<VisualState.Setters>
1135-
<Setter Target="TagIcon.Glyph" Value="&#xE711;" />
1139+
<Setter Target="TagPill.Background" Value="{ThemeResource CardBackgroundFillColorDefault}" />
1140+
<Setter Target="RemoveTagIcon.Visibility" Value="Visible" />
11361141
</VisualState.Setters>
11371142
</VisualState>
11381143
</VisualStateGroup>

src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ private void FileTag_PointerExited(object sender, PointerRoutedEventArgs e)
816816
VisualStateManager.GoToState((UserControl)sender, "Normal", true);
817817
}
818818

819-
private void TagIcon_Tapped(object sender, TappedRoutedEventArgs e)
819+
private void RemoveTagIcon_Tapped(object sender, TappedRoutedEventArgs e)
820820
{
821821
var parent = (sender as FontIcon)?.Parent as StackPanel;
822822
var tagName = (parent?.Children[TAG_TEXT_BLOCK] as TextBlock)?.Text;

0 commit comments

Comments
 (0)