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

Merge branch 'master' of https://github.com/migueldeicaza/gui.cs into combobox_fixes2

Browse Source
This commit is contained in:
Ross Ferguson
2020-07-04 01:28:30 +01:00
parent c71fad0050 527c8aa365
commit 852400957e
2 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Example/demo.cs
View File

@@ -237,12 +237,13 @@ static class Demo {
//
static void Editor ()
{
var tframe = Application.Top.Frame;
Application.Top.RemoveAll ();
Application.Init ();
var ntop = Application.Top;
var menu = new MenuBar (new MenuBarItem [] {
new MenuBarItem ("_File", new MenuItem [] {
new MenuItem ("_Close", "", () => { if (Quit ()) {Application.RequestStop (); } }),
new MenuItem ("_Close", "", () => { if (Quit ()) { running = MainApp; Application.RequestStop (); } }),
}),
new MenuBarItem ("_Edit", new MenuItem [] {
new MenuItem ("_Copy", "", null),
@@ -267,15 +268,13 @@ static class Demo {
};
ntop.Add (win);
var text = new TextView (new Rect (0, 0, tframe.Width - 2, tframe.Height - 3));
var text = new TextView () { X = 0, Y = 0, Width = Dim.Fill (), Height = Dim.Fill () };
if (fname != null)
text.Text = System.IO.File.ReadAllText (fname);
win.Add (text);
Application.Run (ntop, false);
Application.Top.RemoveAll ();
Main ();
}
static bool Quit ()
@@ -535,11 +534,20 @@ static class Demo {
}
#endregion
public static Action running = MainApp;
static void Main ()
{
while (running != null) {
running.Invoke ();
}
Application.Shutdown ();
}
public static Label ml;
public static MenuBar menu;
public static CheckBox menuKeysStyle;
public static CheckBox menuAutoMouseNav;
static void Main ()
static void MainApp ()
{
if (Debugger.IsAttached)
CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.GetCultureInfo ("en-US");
@@ -579,14 +587,14 @@ static class Demo {
menu = new MenuBar (new MenuBarItem [] {
new MenuBarItem ("_File", new MenuItem [] {
new MenuItem ("Text _Editor Demo", "", () => { Editor (); }),
new MenuItem ("Text _Editor Demo", "", () => { running = Editor; Application.RequestStop (); }),
new MenuItem ("_New", "Creates new file", NewFile),
new MenuItem ("_Open", "", Open),
new MenuItem ("_Hex", "", () => ShowHex (top)),
new MenuItem ("_Close", "", () => Close ()),
new MenuItem ("_Disabled", "", () => { }, () => false),
null,
new MenuItem ("_Quit", "", () => { if (Quit ()) top.Running = false; })
new MenuItem ("_Quit", "", () => { if (Quit ()) { running = null; top.Running = false; } })
}),
new MenuBarItem ("_Edit", new MenuItem [] {
new MenuItem ("_Copy", "", Copy),
@@ -649,9 +657,8 @@ static class Demo {
new StatusItem(Key.F1, "~F1~ Help", () => Help()),
new StatusItem(Key.F2, "~F2~ Load", Load),
new StatusItem(Key.F3, "~F3~ Save", Save),
new StatusItem(Key.ControlQ, "~^Q~ Quit", () => { if (Quit ()) top.Running = false; }),
}) {
};
new StatusItem(Key.ControlQ, "~^Q~ Quit", () => { if (Quit ()) { running = null; top.Running = false; } })
});
win.Add (drag, dragText);
@@ -672,7 +679,7 @@ static class Demo {
top.Add (win);
//top.Add (menu);
top.Add (menu, statusBar);
Application.Run ();
Application.Run (top, false);
}
private static void Win_KeyPress (View.KeyEventEventArgs e)

15
Terminal.Gui/Core/Application.cs
View File

@@ -586,16 +586,23 @@ namespace Terminal.Gui {
MainLoop.MainIteration ();
Iteration?.Invoke ();
} else if (wait == false)
} else if (wait == false) {
return;
if (state.Toplevel.NeedDisplay != null && (!state.Toplevel.NeedDisplay.IsEmpty || state.Toplevel.childNeedsDisplay)) {
}
if (state.Toplevel != Top && (!Top.NeedDisplay.IsEmpty || Top.childNeedsDisplay)) {
Top.Redraw (Top.Bounds);
state.Toplevel.SetNeedsDisplay (state.Toplevel.Bounds);
}
if (!state.Toplevel.NeedDisplay.IsEmpty || state.Toplevel.childNeedsDisplay) {
state.Toplevel.Redraw (state.Toplevel.Bounds);
if (DebugDrawBounds)
if (DebugDrawBounds) {
DrawBounds (state.Toplevel);
}
state.Toplevel.PositionCursor ();
Driver.Refresh ();
} else
} else {
Driver.UpdateCursor ();
}
}
}