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' into crlf_label

Browse Source
This commit is contained in:
Charlie Kindel
2020-06-18 10:26:04 -07:00
parent 10f90a7a7a 71a62dc1a1
commit 606e2728ae
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Example/demo.cs
View File

@@ -235,14 +235,14 @@ static class Demo {
}
//
// Creates a nested editor
static void Editor (Toplevel top)
static void Editor ()
{
var tframe = top.Frame;
var ntop = new Toplevel (tframe);
var tframe = Application.Top.Frame;
Application.Top.RemoveAll ();
var ntop = Application.Top;
var menu = new MenuBar (new MenuBarItem [] {
new MenuBarItem ("_File", new MenuItem [] {
new MenuItem ("_Close", "", () => {Application.RequestStop ();}),
new MenuItem ("_Close", "", () => { if (Quit ()) {Application.RequestStop (); } }),
}),
new MenuBarItem ("_Edit", new MenuItem [] {
new MenuItem ("_Copy", "", null),
@@ -273,7 +273,9 @@ static class Demo {
text.Text = System.IO.File.ReadAllText (fname);
win.Add (text);
Application.Run (ntop);
Application.Run (ntop, false);
Application.Top.RemoveAll ();
Main ();
}
static bool Quit ()
@@ -576,7 +578,7 @@ static class Demo {
menu = new MenuBar (new MenuBarItem [] {
new MenuBarItem ("_File", new MenuItem [] {
new MenuItem ("Text _Editor Demo", "", () => { Editor (top); }),
new MenuItem ("Text _Editor Demo", "", () => { Editor (); }),
new MenuItem ("_New", "Creates new file", NewFile),
new MenuItem ("_Open", "", Open),
new MenuItem ("_Hex", "", () => ShowHex (top)),