Skip to content

Commit 490c143

Browse files
authored
Feature: Tweaked tag design (#9583)
1 parent c08fa1b commit 490c143

File tree

1 file changed

+33
-32
lines changed

1 file changed

+33
-32
lines changed

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

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<local:BaseLayout
22
x:Class="Files.Uwp.Views.LayoutModes.DetailsLayoutBrowser"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
54
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
6-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7-
xmlns:local="using:Files.Uwp"
8-
xmlns:behaviors2="using:Files.Uwp.Behaviors"
9-
xmlns:converters1="using:Files.Uwp.Converters"
10-
xmlns:local2="using:Files.Uwp.Filesystem"
11-
xmlns:helpers="using:Files.Uwp.Helpers"
12-
xmlns:uc="using:Files.Uwp.UserControls"
13-
xmlns:vc="using:Files.Uwp.ValueConverters"
14-
xmlns:tui="using:Microsoft.Toolkit.Uwp.UI"
155
xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
166
xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Behaviors"
7+
xmlns:behaviors2="using:Files.Uwp.Behaviors"
178
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
189
xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
19-
xmlns:triggers="using:Microsoft.Toolkit.Uwp.UI.Triggers"
20-
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
21-
xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
10+
xmlns:converters1="using:Files.Uwp.Converters"
11+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
12+
xmlns:helpers="using:Files.Uwp.Helpers"
2213
xmlns:i="using:Microsoft.Xaml.Interactivity"
14+
xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
15+
xmlns:local="using:Files.Uwp"
16+
xmlns:local2="using:Files.Uwp.Filesystem"
17+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
18+
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
19+
xmlns:triggers="using:Microsoft.Toolkit.Uwp.UI.Triggers"
20+
xmlns:tui="using:Microsoft.Toolkit.Uwp.UI"
21+
xmlns:uc="using:Files.Uwp.UserControls"
22+
xmlns:vc="using:Files.Uwp.ValueConverters"
2323
x:Name="PageRoot"
2424
NavigationCacheMode="Enabled"
2525
mc:Ignorable="d">
@@ -252,9 +252,7 @@
252252
PointerPressed="Grid_PointerPressed">
253253
<Grid.ContextFlyout>
254254
<MenuFlyout>
255-
<MenuFlyoutItem
256-
Click="SizeAllColumnsToFit_Click"
257-
Text="{helpers:ResourceString Name=SizeAllColumnsToFit}" />
255+
<MenuFlyoutItem Click="SizeAllColumnsToFit_Click" Text="{helpers:ResourceString Name=SizeAllColumnsToFit}" />
258256
<MenuFlyoutSeparator />
259257
<ToggleMenuFlyoutItem
260258
Click="ToggleMenuFlyoutItem_Click"
@@ -638,30 +636,33 @@
638636
<SolidColorBrush x:Key="TextControlBackgroundFocused" Color="{ThemeResource SolidBackgroundFillColorSecondary}" />
639637
</TextBox.Resources>
640638
</TextBox>
641-
<Ellipse
642-
Grid.Column="1"
643-
Width="12"
644-
Height="12"
645-
Margin="4,0,0,0"
646-
VerticalAlignment="Center"
647-
x:Phase="2"
648-
Fill="{x:Bind FileTagsUI[0].ColorModel, Mode=OneWay, Converter={StaticResource ColorModelToColorConverter}}"
649-
Visibility="{x:Bind FileTagsUI, Converter={StaticResource EmptyObjectToObjectConverter}, Mode=OneWay}" />
650639
</Grid>
651640

652641
<Grid
653642
x:Name="ItemTagGrid"
654643
Grid.Column="2"
655644
Width="{Binding ColumnsViewModel.TagColumn.Length.Value, ElementName=PageRoot, Mode=OneWay}"
656-
Padding="12,0,0,0"
657645
HorizontalAlignment="Stretch"
658646
VerticalAlignment="Center"
659647
Visibility="{Binding ColumnsViewModel.TagColumn.Visibility, ElementName=PageRoot, Mode=OneWay}">
660-
<TextBlock
661-
Style="{StaticResource ColumnContentTextBlock}"
662-
Text="{x:Bind FileTagsUI[0].TagName, Mode=OneWay}"
663-
TextTrimming="CharacterEllipsis"
664-
Visibility="{x:Bind FileTagsUI, Converter={StaticResource EmptyObjectToObjectConverter}, Mode=OneWay}" />
648+
<Border
649+
Height="20"
650+
Padding="8,0"
651+
HorizontalAlignment="Left"
652+
x:Phase="2"
653+
Background="{x:Bind FileTagsUI[0].ColorModel, Mode=OneWay, Converter={StaticResource ColorModelToColorConverter}}"
654+
BorderBrush="{x:Bind FileTagsUI[0].ColorModel, Mode=OneWay, Converter={StaticResource ColorModelToColorConverter}}"
655+
BorderThickness="1"
656+
CornerRadius="8"
657+
ToolTipService.ToolTip="{x:Bind FileTagsUI[0].TagName, Mode=OneWay}"
658+
Visibility="{x:Bind FileTagsUI, Converter={StaticResource EmptyObjectToObjectConverter}, Mode=OneWay}">
659+
<TextBlock
660+
FontSize="12"
661+
Style="{StaticResource ColumnContentTextBlock}"
662+
Text="{x:Bind FileTagsUI[0].TagName, Mode=OneWay}"
663+
TextTrimming="CharacterEllipsis"
664+
Visibility="{x:Bind FileTagsUI, Converter={StaticResource EmptyObjectToObjectConverter}, Mode=OneWay}" />
665+
</Border>
665666
</Grid>
666667

667668
<TextBlock
@@ -998,4 +999,4 @@
998999
</VisualStateManager.VisualStateGroups>
9991000
</Grid>
10001001
</RefreshContainer>
1001-
</local:BaseLayout>
1002+
</local:BaseLayout>

0 commit comments

Comments
 (0)