prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use wrap text warpping & set max width of all children

Browse source
This commit is contained in:
Jack251970 2025-09-15 18:40:16 +08:00
parent b5c860db1d
commit 44ca9c3480
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
View file

@ -202,7 +202,7 @@ namespace Flow.Launcher.Core.Plugin
{ {
Text = attributes.Label, Text = attributes.Label,
VerticalAlignment = VerticalAlignment.Center, VerticalAlignment = VerticalAlignment.Center,
TextWrapping = TextWrapping.WrapWithOverflow TextWrapping = TextWrapping.Wrap
}; };
// Create a text block for description // Create a text block for description
@ -213,7 +213,7 @@ namespace Flow.Launcher.Core.Plugin
{ {
Text = attributes.Description, Text = attributes.Description,
VerticalAlignment = VerticalAlignment.Center, VerticalAlignment = VerticalAlignment.Center,
TextWrapping = TextWrapping.WrapWithOverflow TextWrapping = TextWrapping.Wrap
}; };
desc.SetResourceReference(TextBlock.StyleProperty, "SettingPanelTextBlockDescriptionStyle"); // for theme change desc.SetResourceReference(TextBlock.StyleProperty, "SettingPanelTextBlockDescriptionStyle"); // for theme change
@ -249,7 +249,8 @@ namespace Flow.Launcher.Core.Plugin
VerticalAlignment = VerticalAlignment.Center, VerticalAlignment = VerticalAlignment.Center,
Margin = SettingPanelItemLeftTopBottomMargin, Margin = SettingPanelItemLeftTopBottomMargin,
Text = Settings[attributes.Name] as string ?? string.Empty, Text = Settings[attributes.Name] as string ?? string.Empty,
ToolTip = attributes.Description ToolTip = attributes.Description,
TextWrapping = TextWrapping.Wrap
}; };
textBox.TextChanged += (_, _) => textBox.TextChanged += (_, _) =>
@ -271,7 +272,8 @@ namespace Flow.Launcher.Core.Plugin
VerticalAlignment = VerticalAlignment.Center, VerticalAlignment = VerticalAlignment.Center,
Margin = SettingPanelItemLeftMargin, Margin = SettingPanelItemLeftMargin,
Text = Settings[attributes.Name] as string ?? string.Empty, Text = Settings[attributes.Name] as string ?? string.Empty,
ToolTip = attributes.Description ToolTip = attributes.Description,
TextWrapping = TextWrapping.Wrap
}; };
textBox.TextChanged += (_, _) => textBox.TextChanged += (_, _) =>
@ -335,7 +337,7 @@ namespace Flow.Launcher.Core.Plugin
HorizontalAlignment = HorizontalAlignment.Stretch, HorizontalAlignment = HorizontalAlignment.Stretch,
VerticalAlignment = VerticalAlignment.Center, VerticalAlignment = VerticalAlignment.Center,
Margin = SettingPanelItemLeftTopBottomMargin, Margin = SettingPanelItemLeftTopBottomMargin,
TextWrapping = TextWrapping.WrapWithOverflow, TextWrapping = TextWrapping.Wrap,
AcceptsReturn = true, AcceptsReturn = true,
Text = Settings[attributes.Name] as string ?? string.Empty, Text = Settings[attributes.Name] as string ?? string.Empty,
ToolTip = attributes.Description ToolTip = attributes.Description
@ -508,7 +510,21 @@ namespace Flow.Launcher.Core.Plugin
if (workingWidth <= 0) return; if (workingWidth <= 0) return;
grid.ColumnDefinitions[0].MaxWidth = MainGridColumn0MaxWidthRatio * workingWidth; var constrainedWidth = MainGridColumn0MaxWidthRatio * workingWidth;
// Set MaxWidth of column 0 and its childrens
// We must set MaxWidth of its childrens to make text wrapping work correctly
grid.ColumnDefinitions[0].MaxWidth = constrainedWidth;
foreach (var child in grid.Children)
{
if (child is FrameworkElement element && Grid.GetColumn(element) == 0 && Grid.GetColumnSpan(element) == 1)
{
if (element.MaxWidth < constrainedWidth)
continue;
element.MaxWidth = constrainedWidth;
}
}
} }
private static bool NeedSaveInSettings(string type) private static bool NeedSaveInSettings(string type)