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

Also fixed the position and unicode on StatusBar.

Browse Source
This commit is contained in:
BDisp
2020-07-12 13:59:06 +01:00
parent fb317622ca
commit f34e869ad6
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Terminal.Gui/Core/Toplevel.cs
View File

@@ -286,6 +286,7 @@ namespace Terminal.Gui {
internal void PositionToplevels ()
{
PositionToplevel (this);
foreach (var top in Subviews) {
if (top is Toplevel) {
PositionToplevel ((Toplevel)top);

10
Terminal.Gui/Views/StatusBar.cs
View File

@@ -88,7 +88,7 @@ namespace Terminal.Gui {
CanFocus = false;
ColorScheme = Colors.Menu;
X = 0;
Y = Driver.Rows - 1;
Y = SuperView != null ? SuperView.Frame.Height - 1 : Pos.AnchorEnd (1);
Width = Dim.Fill ();
Height = 1;
@@ -100,8 +100,8 @@ namespace Terminal.Gui {
return delegate {
X = 0;
Height = 1;
if (SuperView == null || SuperView == Application.Top) {
Y = Driver.Rows - 1;
if (SuperView == null || SuperView is Toplevel) {
Y = SuperView.Frame.Height - 1;
} else {
//Y = Pos.Bottom (SuperView);
}
@@ -125,7 +125,7 @@ namespace Terminal.Gui {
//}
Move (0, 0);
Driver.SetAttribute (ColorScheme.Normal);
Driver.SetAttribute (Colors.Menu.Normal);
for (int i = 0; i < Frame.Width; i++)
Driver.AddRune (' ');
@@ -134,7 +134,7 @@ namespace Terminal.Gui {
Driver.SetAttribute (scheme);
for (int i = 0; i < Items.Length; i++) {
var title = Items [i].Title;
for (int n = 0; n < title.Length; n++) {
for (int n = 0; n < title.RuneCount; n++) {
if (title [n] == '~') {
scheme = ToggleScheme (scheme);
continue;

7
UICatalog/Scenarios/Unicode.cs
View File

@@ -36,6 +36,13 @@ namespace UICatalog {
});
Top.Add (menu);
var statusBar = new StatusBar (new StatusItem [] {
new StatusItem (Key.ControlQ, "~^Q~ Выход", () => Application.RequestStop()),
new StatusItem (Key.Unknown, "~F2~ Создать", null),
new StatusItem(Key.Unknown, "~F3~ Со_хранить", null),
});
Top.Add (statusBar);
var label = new Label ("Label:") { X = 0, Y = 1 };
Win.Add (label);
var testlabel = new Label (gitString) { X = 20, Y = Pos.Y (label), Width = Dim.Percent (50), };