Skip to content

Commit 2d5812c

Browse files
authored
Fix: Added text wrapping to custom icon page (#9590)
1 parent c940770 commit 2d5812c

File tree

1 file changed

+28
-17
lines changed

1 file changed

+28
-17
lines changed

src/Files.Uwp/Views/CustomFolderIcons.xaml

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
77
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
88
xmlns:helpers="using:Files.Uwp.Helpers"
9-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
10-
xmlns:shared="using:Files.Shared"
11-
Background="Transparent"
9+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
10+
xmlns:shared="using:Files.Shared"
11+
Background="Transparent"
1212
mc:Ignorable="d">
1313

1414
<Page.Resources>
@@ -43,14 +43,14 @@
4343
<TextBlock
4444
Grid.Row="0"
4545
Grid.Column="0"
46-
Grid.ColumnSpan="2"
4746
Padding="4"
48-
Text="{helpers:ResourceString Name=ChooseCustomIcon}" />
47+
MaxLines="2"
48+
Text="{helpers:ResourceString Name=ChooseCustomIcon}"
49+
TextWrapping="WrapWholeWords" />
4950
<Button
5051
x:Name="RestoreDefaultButton"
5152
Grid.Row="0"
52-
Grid.Column="0"
53-
Grid.ColumnSpan="2"
53+
Grid.Column="1"
5454
HorizontalAlignment="Right"
5555
x:Load="{x:Bind IsShortcutItem, Converter={StaticResource BoolNegationConverter}}"
5656
Command="{x:Bind RestoreDefaultIconCommand}"
@@ -63,24 +63,35 @@
6363
Margin="-12,0"
6464
Background="{ThemeResource CardStrokeColorDefaultBrush}" />
6565

66-
<TextBox
67-
x:Name="ItemDisplayedPath"
66+
<Grid
6867
Grid.Row="2"
6968
Grid.Column="0"
70-
IsReadOnly="True" />
71-
<Button
72-
x:Name="PickDllButton"
73-
Grid.Row="2"
74-
Grid.Column="1"
75-
Click="PickDllButton_Click"
76-
Content="{helpers:ResourceString Name=Browse}" />
69+
Grid.ColumnSpan="2"
70+
ColumnSpacing="8">
71+
<Grid.ColumnDefinitions>
72+
<ColumnDefinition Width="*" />
73+
<ColumnDefinition Width="Auto" />
74+
</Grid.ColumnDefinitions>
75+
76+
<TextBox
77+
x:Name="ItemDisplayedPath"
78+
Grid.Column="0"
79+
IsReadOnly="True" />
80+
81+
<Button
82+
x:Name="PickDllButton"
83+
Grid.Column="1"
84+
HorizontalAlignment="Right"
85+
Click="PickDllButton_Click"
86+
Content="{helpers:ResourceString Name=Browse}" />
87+
</Grid>
7788

7889
<GridView
7990
x:Name="IconSelectionGrid"
8091
Grid.Row="3"
8192
Grid.Column="0"
8293
Grid.ColumnSpan="3"
83-
MaxHeight="240"
94+
MaxHeight="252"
8495
HorizontalAlignment="Stretch"
8596
VerticalAlignment="Stretch"
8697
ScrollViewer.HorizontalScrollBarVisibility="Disabled"

0 commit comments

Comments
 (0)