Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-28 16:58:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1979. MessageBox.Query not wrapping since 1.7.1

Browse Source
This commit is contained in:
BDisp
2022-09-06 14:22:14 +01:00
parent d27f376c44
commit c2a9be6ecd
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Terminal.Gui/Windows/MessageBox.cs
View File

@@ -1,7 +1,6 @@
using NStack;
using System;
using System.Collections.Generic;
using System.Linq;
namespace Terminal.Gui {
/// <summary>
@@ -240,7 +239,16 @@ namespace Terminal.Gui {
int defaultButton = 0, Border border = null, params ustring [] buttons)
{
const int defaultWidth = 50;
int textWidth = TextFormatter.MaxWidth (message, width == 0 ? defaultWidth : width);
int maxWidthLine = TextFormatter.MaxWidthLine (message);
if (maxWidthLine > Application.Driver.Cols) {
maxWidthLine = Application.Driver.Cols;
}
if (width == 0) {
maxWidthLine = Math.Max (maxWidthLine, defaultWidth);
} else {
maxWidthLine = width;
}
int textWidth = TextFormatter.MaxWidth (message, maxWidthLine);
int textHeight = TextFormatter.MaxLines (message, textWidth); // message.Count (ustring.Make ('\n')) + 1;
int msgboxHeight = Math.Max (1, textHeight) + 4; // textHeight + (top + top padding + buttons + bottom)
@@ -262,10 +270,11 @@ namespace Terminal.Gui {
// Create Dialog (retain backwards compat by supporting specifying height/width)
Dialog d;
if (width == 0 & height == 0) {
d = new Dialog (title, buttonList.ToArray ());
d.Height = msgboxHeight;
d = new Dialog (title, buttonList.ToArray ()) {
Height = msgboxHeight
};
} else {
d = new Dialog (title, Math.Max (width, textWidth) + 4, height, buttonList.ToArray ());
d = new Dialog (title, width, Math.Max (height, 4), buttonList.ToArray ());
}
if (border != null) {
@@ -277,19 +286,22 @@ namespace Terminal.Gui {
}
if (message != null) {
var l = new Label (textWidth > width ? 0 : (width - 4 - textWidth) / 2, 1, message);
l.LayoutStyle = LayoutStyle.Computed;
l.TextAlignment = TextAlignment.Centered;
l.X = Pos.Center ();
l.Y = Pos.Center ();
l.Width = Dim.Fill (2);
l.Height = Dim.Fill (1);
var l = new Label (message) {
LayoutStyle = LayoutStyle.Computed,
TextAlignment = TextAlignment.Centered,
X = Pos.Center (),
Y = Pos.Center (),
Width = Dim.Fill (),
Height = Dim.Fill (1),
AutoSize = false
};
d.Add (l);
}
// Dynamically size Width
int msgboxWidth = Math.Max (defaultWidth, Math.Max (title.RuneCount + 8, Math.Max (textWidth + 4, d.GetButtonsWidth ()) + 8)); // textWidth + (left + padding + padding + right)
d.Width = msgboxWidth;
if (width == 0 & height == 0) {
// Dynamically size Width
d.Width = Math.Max (maxWidthLine, Math.Max (title.ConsoleWidth, Math.Max (textWidth + 2, d.GetButtonsWidth ()))); // textWidth + (left + padding + padding + right)
}
// Setup actions
Clicked = -1;