Skip to content

Fix: Added text wrapping to custom icon page #9590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 21, 2022
Merged

Fix: Added text wrapping to custom icon page #9590

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
271b22a
Added text wrapping to custom icon page
yaira2 Jul 19, 2022
72854dc
Update CustomFolderIcons.xaml
yaira2 Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 28 additions & 17 deletions src/Files.Uwp/Views/CustomFolderIcons.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:helpers="using:Files.Uwp.Helpers"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:shared="using:Files.Shared"
Background="Transparent"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:shared="using:Files.Shared"
Background="Transparent"
mc:Ignorable="d">

<Page.Resources>
Expand Down Expand Up @@ -43,14 +43,14 @@
<TextBlock
Grid.Row="0"
Grid.Column="0"
Grid.ColumnSpan="2"
Padding="4"
Text="{helpers:ResourceString Name=ChooseCustomIcon}" />
MaxLines="2"
Text="{helpers:ResourceString Name=ChooseCustomIcon}"
TextWrapping="WrapWholeWords" />
<Button
x:Name="RestoreDefaultButton"
Grid.Row="0"
Grid.Column="0"
Grid.ColumnSpan="2"
Grid.Column="1"
HorizontalAlignment="Right"
x:Load="{x:Bind IsShortcutItem, Converter={StaticResource BoolNegationConverter}}"
Command="{x:Bind RestoreDefaultIconCommand}"
Expand All @@ -63,24 +63,35 @@
Margin="-12,0"
Background="{ThemeResource CardStrokeColorDefaultBrush}" />

<TextBox
x:Name="ItemDisplayedPath"
<Grid
Grid.Row="2"
Grid.Column="0"
IsReadOnly="True" />
<Button
x:Name="PickDllButton"
Grid.Row="2"
Grid.Column="1"
Click="PickDllButton_Click"
Content="{helpers:ResourceString Name=Browse}" />
Grid.ColumnSpan="2"
ColumnSpacing="8">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>

<TextBox
x:Name="ItemDisplayedPath"
Grid.Column="0"
IsReadOnly="True" />

<Button
x:Name="PickDllButton"
Grid.Column="1"
HorizontalAlignment="Right"
Click="PickDllButton_Click"
Content="{helpers:ResourceString Name=Browse}" />
</Grid>

<GridView
x:Name="IconSelectionGrid"
Grid.Row="3"
Grid.Column="0"
Grid.ColumnSpan="3"
MaxHeight="240"
MaxHeight="252"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
Expand Down