Skip to content

Commit 4d1144a

Browse files
pizzaboxerpizzaboxer
committed
Better handling of text overflowing
1 parent 9b37ec1 commit 4d1144a

File tree

6 files changed

+20
-19
lines changed

6 files changed

+20
-19
lines changed

‎Bloxstrap.sln

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Global
2626
HideSolutionNode = FALSE
2727
EndGlobalSection
2828
GlobalSection(ExtensibilityGlobals) = postSolution
29+
RESX_NeutralResourcesLanguage = en-GB
2930
SolutionGuid = {ED269E5D-8C72-49B4-A76F-51CF163511C1}
3031
EndGlobalSection
3132
EndGlobal

‎Bloxstrap/UI/Elements/Controls/OptionControl.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
</Hyperlink>
5454
</TextBlock>
5555
</Grid>
56-
<local:MarkdownTextBlock Margin="0,2,0,0" FontSize="12" MarkdownText="{Binding Description, ElementName=Control}" Foreground="{DynamicResource TextFillColorTertiaryBrush}">
56+
<local:MarkdownTextBlock Margin="0,2,0,0" FontSize="12" MarkdownText="{Binding Description, ElementName=Control}" TextWrapping="Wrap" Foreground="{DynamicResource TextFillColorTertiaryBrush}">
5757
<local:MarkdownTextBlock.Style>
5858
<Style TargetType="local:MarkdownTextBlock">
5959
<Style.Triggers>

‎Bloxstrap/UI/Elements/Menu/Pages/AboutPage.xaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
<TextBlock Text="{x:Static resources:Strings.Menu_About_Description}" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
3232
</StackPanel>
3333
</Grid>
34-
<StackPanel Orientation="Horizontal">
35-
<ui:Anchor Margin="0,16,4,0" Content="{x:Static resources:Strings.Menu_About_GithubRepository}" Icon="Code24" NavigateUri="https://github.com/pizzaboxer/bloxstrap" />
36-
<ui:Anchor Margin="4,16,4,0" Content="{x:Static resources:Strings.Menu_About_ReportIssue}" Icon="Chat48" NavigateUri="https://github.com/pizzaboxer/bloxstrap/issues" />
37-
<ui:Anchor Margin="4,16,4,0" Content="{x:Static resources:Strings.Menu_About_HelpInformation}" Icon="BookQuestionMark24" NavigateUri="https://github.com/pizzaboxer/bloxstrap/wiki" />
38-
<ui:Anchor Margin="4,16,0,0" Content="{x:Static resources:Strings.Menu_About_DiscordServer}" Icon="Chat48" NavigateUri="https://discord.gg/nKjV3mGq6R" />
39-
</StackPanel>
34+
<WrapPanel Orientation="Horizontal">
35+
<ui:Anchor Margin="0,16,8,0" Content="{x:Static resources:Strings.Menu_About_GithubRepository}" Icon="Code24" NavigateUri="https://github.com/pizzaboxer/bloxstrap" />
36+
<ui:Anchor Margin="0,16,8,0" Content="{x:Static resources:Strings.Menu_About_ReportIssue}" Icon="Chat48" NavigateUri="https://github.com/pizzaboxer/bloxstrap/issues" />
37+
<ui:Anchor Margin="0,16,8,0" Content="{x:Static resources:Strings.Menu_About_HelpInformation}" Icon="BookQuestionMark24" NavigateUri="https://github.com/pizzaboxer/bloxstrap/wiki" />
38+
<ui:Anchor Margin="0,16,0,0" Content="{x:Static resources:Strings.Menu_About_DiscordServer}" Icon="Chat48" NavigateUri="https://discord.gg/nKjV3mGq6R" />
39+
</WrapPanel>
4040

4141
<StackPanel Visibility="{Binding BuildInformationVisibility, Mode=OneTime}">
4242
<TextBlock Text="Build Information" FontWeight="Medium" FontSize="20" Margin="0,16,0,0" />

‎Bloxstrap/UI/Elements/Menu/Pages/FastFlagEditorPage.xaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323

2424
<ui:InfoBar Grid.Row="1" Margin="0,0,0,16" Padding="8" Title="{x:Static resources:Strings.Menu_FastFlagEditor_BannerTitle}" IsOpen="True" Message="{x:Static resources:Strings.Menu_FastFlagEditor_BannerText}" Severity="Warning" IsClosable="False" />
2525

26-
<StackPanel Grid.Row="2" Margin="0,0,0,16" Orientation="Horizontal">
27-
<ui:Button Icon="ArrowLeft48" Content="{x:Static resources:Strings.Menu_FastFlagEditor_Back}" Click="BackButton_Click" />
28-
<ui:Button Icon="Add28" Content="{x:Static resources:Strings.Menu_FastFlagEditor_AddNew}" Click="AddButton_Click" Margin="12,0,0,0" />
29-
<ui:Button Icon="Delete48" Content="{x:Static resources:Strings.Menu_FastFlagEditor_DeleteSelected}" Click="DeleteButton_Click" Appearance="Danger" Margin="12,0,0,0">
26+
<WrapPanel Grid.Row="2" Orientation="Horizontal">
27+
<ui:Button Icon="ArrowLeft48" Content="{x:Static resources:Strings.Menu_FastFlagEditor_Back}" Click="BackButton_Click" Margin="0,0,12,16" />
28+
<ui:Button Icon="Add28" Content="{x:Static resources:Strings.Menu_FastFlagEditor_AddNew}" Click="AddButton_Click" Margin="0,0,12,16" />
29+
<ui:Button Icon="Delete48" Content="{x:Static resources:Strings.Menu_FastFlagEditor_DeleteSelected}" Click="DeleteButton_Click" Appearance="Danger" Margin="0,0,12,16">
3030
<ui:Button.Style>
3131
<Style TargetType="ui:Button" BasedOn="{StaticResource {x:Type ui:Button}}">
3232
<Style.Triggers>
@@ -37,9 +37,9 @@
3737
</Style>
3838
</ui:Button.Style>
3939
</ui:Button>
40-
<ToggleButton x:Name="TogglePresetsButton" Content="{x:Static resources:Strings.Menu_FastFlagEditor_ShowPresetFlags}" Click="ToggleButton_Click" Margin="12,0,0,0" />
41-
<ui:Button Icon="ArrowExportRtl24" Content="{x:Static resources:Strings.Menu_FastFlagEditor_ExportJson}" Margin="12,0,0,0" Click="ExportJSONButton_Click" />
42-
</StackPanel>
40+
<ToggleButton x:Name="TogglePresetsButton" Content="{x:Static resources:Strings.Menu_FastFlagEditor_ShowPresetFlags}" Click="ToggleButton_Click" Margin="0,0,12,16" />
41+
<ui:Button Icon="ArrowExportRtl24" Content="{x:Static resources:Strings.Menu_FastFlagEditor_ExportJson}" Click="ExportJSONButton_Click" Margin="0,0,12,16" />
42+
</WrapPanel>
4343

4444
<ui:TextBox x:Name="SearchTextBox" Grid.Row="3" Margin="0,0,0,16" Icon="Search32" PlaceholderText="{x:Static resources:Strings.Menu_FastFlagEditor_Search}" TextChanged="SearchTextBox_TextChanged" />
4545

‎Bloxstrap/UI/Elements/Menu/Pages/InstallationPage.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@
6565
<ui:CardAction Grid.Column="0" x:Name="OpenFolderCardAction" Margin="0,0,4,0" Icon="Folder24" Command="{Binding OpenFolderCommand}" >
6666
<StackPanel>
6767
<TextBlock FontSize="14" Text="{x:Static resources:Strings.Menu_Installation_OpenInstallFolder_Title}" />
68-
<TextBlock Margin="0,2,0,0" FontSize="12" Text="{x:Static resources:Strings.Menu_Installation_OpenInstallFolder_Description}" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
68+
<TextBlock Margin="0,2,0,0" FontSize="12" Text="{x:Static resources:Strings.Menu_Installation_OpenInstallFolder_Description}" Foreground="{DynamicResource TextFillColorTertiaryBrush}" TextWrapping="Wrap" />
6969
</StackPanel>
7070
</ui:CardAction>
7171

7272
<ui:CardAction Grid.Column="1" Margin="4,0,0,0" Icon="UninstallApp24" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/pizzaboxer/bloxstrap/wiki/Uninstalling-Bloxstrap">
7373
<StackPanel>
7474
<TextBlock FontSize="14" Text="{x:Static resources:Strings.Menu_Installation_UninstallGuide_Title}" />
75-
<TextBlock Margin="0,2,0,0" FontSize="12" Text="{x:Static resources:Strings.Menu_Installation_UninstallGuide_Description}" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
75+
<TextBlock Margin="0,2,0,0" FontSize="12" Text="{x:Static resources:Strings.Menu_Installation_UninstallGuide_Description}" Foreground="{DynamicResource TextFillColorTertiaryBrush}" TextWrapping="Wrap" />
7676
</StackPanel>
7777
</ui:CardAction>
7878
</Grid>

‎Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</Grid.ColumnDefinitions>
2626
<ui:CardAction Grid.Row="0" Grid.Column="0" x:Name="OpenModFolderCardAction" Margin="0,0,4,0" Icon="Folder24" Command="{Binding OpenModsFolderCommand}" IsEnabled="{Binding Source={x:Static models:GlobalViewModel.IsNotFirstRun}, Mode=OneTime}">
2727
<StackPanel>
28-
<TextBlock FontSize="14" Text="{x:Static resources:Strings.Menu_Mods_OpenModsFolder_Title}">
28+
<TextBlock FontSize="14" Text="{x:Static resources:Strings.Menu_Mods_OpenModsFolder_Title}" TextWrapping="Wrap">
2929
<!--this is so fucking stupid the disabled state of the cardaction doesnt change the header text colour-->
3030
<TextBlock.Style>
3131
<Style>
@@ -38,7 +38,7 @@
3838
</TextBlock.Style>
3939
</TextBlock>
4040

41-
<TextBlock Margin="0,2,0,0" FontSize="12" Foreground="{DynamicResource TextFillColorTertiaryBrush}">
41+
<TextBlock Margin="0,2,0,0" FontSize="12" Foreground="{DynamicResource TextFillColorTertiaryBrush}" TextWrapping="Wrap">
4242
<TextBlock.Style>
4343
<Style>
4444
<Setter Property="TextBlock.Text" Value="{x:Static resources:Strings.Menu_Mods_OpenModsFolder_Description}"/>
@@ -96,7 +96,7 @@
9696
<controls:OptionControl
9797
Header="{x:Static resources:Strings.Menu_Mods_Presets_EmojiType_Title}"
9898
Description="{x:Static resources:Strings.Menu_Mods_Presets_EmojiType_Description}">
99-
<ComboBox Margin="5,0,0,0" Padding="10,5,10,5" Width="200" ItemsSource="{Binding EmojiTypes, Mode=OneTime}" Text="{Binding SelectedEmojiType, Mode=TwoWay}">
99+
<ComboBox Margin="5,0,0,0" Padding="10,5,10,5" Width="220" ItemsSource="{Binding EmojiTypes, Mode=OneTime}" Text="{Binding SelectedEmojiType, Mode=TwoWay}">
100100
<ComboBox.ItemTemplate>
101101
<DataTemplate>
102102
<TextBlock Text="{Binding Path=., Converter={StaticResource ResourceConverter}, ConverterParameter='Enums.EmojiType.'}" />

0 commit comments

Comments
 (0)