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

Enforce minimum panel sizes

Browse Source
This commit is contained in:
tznind
2023-01-14 19:20:11 +00:00
parent a3281a437f
commit 8626c4e2d7
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Terminal.Gui/Views/SplitContainer.cs
View File

@@ -33,8 +33,8 @@ namespace Terminal.Gui {
/// </summary>
public View Panel1 { get; set; } // TODO: Should not be public set, should be helpers for this
public int Panel1MinSize { get; set; }
public int Panel1MinSize { get; set; } = 1;
public ustring Panel1Title { get; set; } = string.Empty;
/// <summary>
@@ -46,7 +46,7 @@ namespace Terminal.Gui {
/// </summary>
public View Panel2 { get; set; } // TODO: Should not be public set, should be helpers for this
public int Panel2MinSize { get; set; }
public int Panel2MinSize { get; set; } = 1;
public ustring Panel2Title { get; set; } = string.Empty;
private Pos splitterDistance = Pos.Percent (50);
@@ -348,31 +348,37 @@ namespace Terminal.Gui {
if (!IsInitialized) {
return pos;
}
var panel1MinSize = Panel1MinSize;
var panel2MinSize = Panel2MinSize;
// if there is a border then there is less space
// for the panels so we need to make size restrictions
// tighter.
if(HasBorder()) {
panel1MinSize++;
panel2MinSize++;
}
var availableSpace = Orientation == Orientation.Horizontal ? this.Bounds.Height : this.Bounds.Width;
var idealPosition = pos.Anchor (availableSpace);
// bad position because not enough space for Panel1
if (idealPosition < Panel1MinSize) {
if (idealPosition < panel1MinSize) {
// TODO: we should preserve Absolute/Percent status here not just force it to absolute
return (Pos)Math.Min (Panel1MinSize, availableSpace);
}
// if there is a border then 2 screen units are taken occupied
// by the border around the edge (one on left, one on right).
if (HasBorder ()) {
availableSpace -= 2;
return (Pos)Math.Min (panel1MinSize, availableSpace);
}
// bad position because not enough space for Panel2
if (availableSpace - idealPosition <= Panel2MinSize) {
if (availableSpace - idealPosition <= panel2MinSize) {
// TODO: we should preserve Absolute/Percent status here not just force it to absolute
// +1 is to allow space for the splitter
return (Pos)Math.Max (availableSpace - (Panel2MinSize + 1), 0);
return (Pos)Math.Max (availableSpace - (panel2MinSize + 1), 0);
}
// this splitter position is fine, there is enough space for everyone

4
UnitTests/SplitContainerTests.cs
View File

@@ -260,7 +260,7 @@ namespace UnitTests {
splitContainer.SplitterDistance = 2;
// Should bound the value to the minimum distance
Assert.Equal (5, splitContainer.SplitterDistance);
Assert.Equal (6, splitContainer.SplitterDistance);
splitContainer.Redraw (splitContainer.Bounds);
@@ -348,7 +348,7 @@ namespace UnitTests {
splitContainer.SplitterDistance = 8;
// Should bound the value to the minimum distance
Assert.Equal (3, splitContainer.SplitterDistance);
Assert.Equal (4, splitContainer.SplitterDistance);
splitContainer.Redraw (splitContainer.Bounds);