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

Merge pull request #655 from BDisp/button-fixes

Browse Source 
Fixed some layout and alignment issues in the Button.
This commit is contained in:
Charlie Kindel
2020-06-09 09:26:35 -06:00
committed by GitHub
parent d50bf78cc9 48240b6b62
commit 5d9ef45c8d
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Terminal.Gui/Core/View.cs
View File

@@ -1591,11 +1591,7 @@ namespace Terminal.Gui {
}
}
if (c_hot_pos > -1) {
if (wLen - runeCount == 0) {
c_hot_pos += (wLen - runeCount == 0 ? w_hot_pos * (space) - space - w_hot_pos + 1 : space + wLen - runeCount);
} else {
c_hot_pos += space + wLen - runeCount;
}
c_hot_pos += w_hot_pos * space - space - w_hot_pos + 1;
}
break;
}

18
UICatalog/Scenarios/Buttons.cs
View File

@@ -54,18 +54,25 @@ namespace UICatalog {
};
Win.Add (colorButtonsLabel);
View prev = colorButtonsLabel;
//View prev = colorButtonsLabel;
//With this method there is no need to call Top.Ready += () => Top.Redraw (Top.Bounds);
var x = Pos.Right (colorButtonsLabel) + 2;
foreach (var colorScheme in Colors.ColorSchemes) {
var colorButton = new Button ($"{colorScheme.Key}") {
ColorScheme = colorScheme.Value,
X = Pos.Right (prev) + 2,
//X = Pos.Right (prev) + 2,
X = x,
Y = Pos.Y (colorButtonsLabel),
};
DoMessage (colorButton, colorButton.Text);
Win.Add (colorButton);
prev = colorButton;
//prev = colorButton;
x += colorButton.Frame.Width + 2;
}
// BUGBUG: For some reason these buttons don't move to correct locations initially.
// This was the only way I find to resolves this with the View prev variable.
//Top.Ready += () => Top.Redraw (Top.Bounds);
Button button;
Win.Add (button = new Button ("A super long _Button that will probably expose a bug in clipping or wrapping of text. Will it?") {
@@ -119,7 +126,8 @@ namespace UICatalog {
};
moveBtn.Clicked = () => {
moveBtn.X = moveBtn.Frame.X + 5;
computedFrame.LayoutSubviews (); // BUGBUG: This call should not be needed. View.X is not causing relayout correctly
// This is already fixed with the call to SetNeedDisplay() in the Pos Dim.
//computedFrame.LayoutSubviews (); // BUGBUG: This call should not be needed. View.X is not causing relayout correctly
};
computedFrame.Add (moveBtn);
@@ -212,7 +220,7 @@ namespace UICatalog {
var muhkb = " ~  s  gui.cs   master ↑10 = Сохранить";
var moveUnicodeHotKeyBtn = new Button (muhkb) {
X = Pos.Right (moveHotKeyBtn) + 6,
X = Pos.Left (absoluteFrame) + 1,
Y = Pos.Bottom (radioGroup) + 1,
Width = muhkb.Length + 30,
ColorScheme = Colors.TopLevel,