Partially modernizes Scenarios (#4512)

This commit is contained in:
Tig
2025-12-19 20:02:04 -07:00
committed by GitHub
parent 8f4ad8a7d4
commit af0efb3c64
17 changed files with 1307 additions and 1045 deletions

View File

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Linq;
using System.Text;
namespace UICatalog.Scenarios;
@@ -14,24 +9,27 @@ public class Bars : Scenario
public override void Main ()
{
Application.Init ();
Runnable app = new ();
using IApplication app = Application.Instance;
app.IsModalChanged += App_Loaded;
using Runnable mainWindow = new ();
Application.Run (app);
app.Dispose ();
Application.Shutdown ();
mainWindow.IsModalChanged += App_Loaded;
app.Run (mainWindow);
}
// Setting everything up in Loaded handler because we change the
// QuitKey and it only sticks if changed after init
// QuitKey it only sticks if changed after init
private void App_Loaded (object sender, EventArgs e)
{
Application.TopRunnableView!.Title = GetQuitKeyAndName ();
if (sender is not Runnable mainWindow)
{
return;
}
ObservableCollection<string> eventSource = new ();
ListView eventLog = new ListView ()
ListView eventLog = new ()
{
Title = "Event Log",
X = Pos.AnchorEnd (),
@@ -41,7 +39,7 @@ public class Bars : Scenario
Source = new ListWrapper<string> (eventSource)
};
eventLog.Border!.Thickness = new (0, 1, 0, 0);
Application.TopRunnableView.Add (eventLog);
mainWindow.Add (eventLog);
FrameView menuBarLikeExamples = new ()
{
@@ -49,30 +47,30 @@ public class Bars : Scenario
X = 0,
Y = 0,
Width = Dim.Fill () - Dim.Width (eventLog),
Height = Dim.Percent(33),
Height = Dim.Percent (33)
};
Application.TopRunnableView.Add (menuBarLikeExamples);
mainWindow.Add (menuBarLikeExamples);
Label label = new Label ()
Label label = new ()
{
Title = " Bar:",
X = 0,
Y = 0,
Y = 0
};
menuBarLikeExamples.Add (label);
Bar bar = new Bar
Bar bar = new ()
{
Id = "menuBar-like",
X = Pos.Right (label),
Y = Pos.Top (label),
Width = Dim.Fill (),
Width = Dim.Fill ()
};
ConfigMenuBar (bar);
menuBarLikeExamples.Add (bar);
label = new Label ()
label = new ()
{
Title = " MenuBar:",
X = 0,
@@ -96,80 +94,171 @@ public class Bars : Scenario
X = 0,
Y = Pos.Center (),
Width = Dim.Fill () - Dim.Width (eventLog),
Height = Dim.Percent (33),
Height = Dim.Percent (33)
};
Application.TopRunnableView.Add (menuLikeExamples);
mainWindow.Add (menuLikeExamples);
label = new Label ()
label = new ()
{
Title = "Bar:",
X = 0,
Y = 0,
Y = 0
};
menuLikeExamples.Add (label);
bar = new Bar
bar = new ()
{
Id = "menu-like",
X = 0,
Y = Pos.Bottom(label),
Y = Pos.Bottom (label),
//Width = Dim.Percent (40),
Orientation = Orientation.Vertical,
Orientation = Orientation.Vertical
};
ConfigureMenu (bar);
menuLikeExamples.Add (bar);
label = new Label ()
label = new ()
{
Title = "Menu:",
X = Pos.Right(bar) + 1,
Y = Pos.Top (label),
X = Pos.Right (bar) + 1,
Y = Pos.Top (label)
};
menuLikeExamples.Add (label);
bar = new Menu
bar = new ()
{
Id = "menu",
X = Pos.Left (label),
Y = Pos.Bottom (label),
Y = Pos.Bottom (label)
};
ConfigureMenu (bar);
bar.Arrangement = ViewArrangement.RightResizable;
menuLikeExamples.Add (bar);
label = new Label ()
label = new ()
{
Title = "PopOver Menu (Right click to show):",
X = Pos.Right (bar) + 1,
Y = Pos.Top (label),
Y = Pos.Top (label)
};
menuLikeExamples.Add (label);
Menu popOverMenu = new Menu
Menu popOverMenu = new ()
{
Id = "popupMenu",
X = Pos.Left (label),
Y = Pos.Bottom (label),
Y = Pos.Bottom (label)
};
ConfigureMenu (popOverMenu);
popOverMenu.Arrangement = ViewArrangement.Overlapped;
popOverMenu.Visible = false;
//popOverMenu.Enabled = false;
var toggleShortcut = new Shortcut
Shortcut toggleShortcut = new ()
{
Title = "Toggle Hide",
Text = "App",
BindKeyToApplication = true,
Key = Key.F4.WithCtrl,
Key = Key.F4.WithCtrl
};
popOverMenu.Add (toggleShortcut);
popOverMenu.Accepting += PopOverMenuOnAccept;
menuLikeExamples.Add (popOverMenu);
menuLikeExamples.MouseEvent += MenuLikeExamplesMouseEvent;
FrameView statusBarLikeExamples = new ()
{
Title = "StatusBar-Like Examples",
X = 0,
Y = Pos.AnchorEnd (),
Width = Dim.Width (menuLikeExamples),
Height = Dim.Percent (33)
};
mainWindow.Add (statusBarLikeExamples);
label = new ()
{
Title = " Bar:",
X = 0,
Y = 0
};
statusBarLikeExamples.Add (label);
bar = new()
{
Id = "statusBar-like",
X = Pos.Right (label),
Y = Pos.Top (label),
Width = Dim.Fill (),
Orientation = Orientation.Horizontal
};
ConfigStatusBar (bar);
statusBarLikeExamples.Add (bar);
label = new ()
{
Title = "StatusBar:",
X = 0,
Y = Pos.Bottom (bar) + 1
};
statusBarLikeExamples.Add (label);
bar = new ()
{
Id = "statusBar",
X = Pos.Right (label),
Y = Pos.Top (label),
Width = Dim.Fill ()
};
ConfigStatusBar (bar);
statusBarLikeExamples.Add (bar);
foreach (FrameView frameView in mainWindow.SubViews.OfType<FrameView> ())
{
foreach (Bar barView in frameView.SubViews.OfType<Bar> ())
{
foreach (Shortcut sh in barView.SubViews.OfType<Shortcut> ())
{
sh.Accepting += (_, _) =>
{
eventSource.Add ($"Accept: {sh!.SuperView!.Id} {sh!.CommandView.Text}");
eventLog.MoveDown ();
//args.Handled = true;
};
}
}
}
return;
void MenuLikeExamplesMouseEvent (object _, MouseEventArgs mouse)
{
if (mouse.Flags.HasFlag (MouseFlags.Button3Clicked))
{
popOverMenu.X = mouse.Position.X;
popOverMenu.Y = mouse.Position.Y;
popOverMenu.Visible = true;
//popOverMenu.Enabled = popOverMenu.Visible;
popOverMenu.SetFocus ();
}
else
{
popOverMenu.Visible = false;
//popOverMenu.Enabled = popOverMenu.Visible;
}
}
void PopOverMenuOnAccept (object o, CommandEventArgs args)
{
if (popOverMenu.Visible)
@@ -182,91 +271,8 @@ public class Bars : Scenario
popOverMenu.SetFocus ();
}
}
menuLikeExamples.Add (popOverMenu);
menuLikeExamples.MouseEvent += MenuLikeExamplesMouseEvent;
void MenuLikeExamplesMouseEvent (object _, MouseEventArgs e)
{
if (e.Flags.HasFlag (MouseFlags.Button3Clicked))
{
popOverMenu.X = e.Position.X;
popOverMenu.Y = e.Position.Y;
popOverMenu.Visible = true;
//popOverMenu.Enabled = popOverMenu.Visible;
popOverMenu.SetFocus ();
}
else
{
popOverMenu.Visible = false;
//popOverMenu.Enabled = popOverMenu.Visible;
}
}
FrameView statusBarLikeExamples = new ()
{
Title = "StatusBar-Like Examples",
X = 0,
Y = Pos.AnchorEnd (),
Width = Dim.Width (menuLikeExamples),
Height = Dim.Percent (33),
};
Application.TopRunnableView.Add (statusBarLikeExamples);
label = new Label ()
{
Title = " Bar:",
X = 0,
Y = 0,
};
statusBarLikeExamples.Add (label);
bar = new Bar
{
Id = "statusBar-like",
X = Pos.Right (label),
Y = Pos.Top (label),
Width = Dim.Fill (),
Orientation = Orientation.Horizontal,
};
ConfigStatusBar (bar);
statusBarLikeExamples.Add (bar);
label = new Label ()
{
Title = "StatusBar:",
X = 0,
Y = Pos.Bottom (bar) + 1,
};
statusBarLikeExamples.Add (label);
bar = new StatusBar ()
{
Id = "statusBar",
X = Pos.Right (label),
Y = Pos.Top (label),
Width = Dim.Fill (),
};
ConfigStatusBar (bar);
statusBarLikeExamples.Add (bar);
foreach (FrameView frameView in Application.TopRunnableView.SubViews.Where (f => f is FrameView)!)
{
foreach (Bar barView in frameView.SubViews.Where (b => b is Bar)!)
{
foreach (Shortcut sh in barView.SubViews.Where (s => s is Shortcut)!)
{
sh.Accepting += (o, args) =>
{
eventSource.Add ($"Accept: {sh!.SuperView.Id} {sh!.CommandView.Text}");
eventLog.MoveDown ();
//args.Handled = true;
};
}
}
}
}
//private void SetupContentMenu ()
//{
// Application.TopRunnable.Add (new Label { Text = "Right Click for Context Menu", X = Pos.Center (), Y = 4 });
@@ -407,10 +413,9 @@ public class Bars : Scenario
// Application.MouseEvent -= Application_MouseEvent;
//}
private void ConfigMenuBar (Bar bar)
{
var fileMenuBarItem = new Shortcut
Shortcut fileMenuBarItem = new ()
{
Title = "_File",
HelpText = "File Menu",
@@ -418,7 +423,7 @@ public class Bars : Scenario
HighlightStates = MouseState.In
};
var editMenuBarItem = new Shortcut
Shortcut editMenuBarItem = new ()
{
Title = "_Edit",
HelpText = "Edit Menu",
@@ -426,7 +431,7 @@ public class Bars : Scenario
HighlightStates = MouseState.In
};
var helpMenuBarItem = new Shortcut
Shortcut helpMenuBarItem = new ()
{
Title = "_Help",
HelpText = "Halp Menu",
@@ -439,8 +444,7 @@ public class Bars : Scenario
private void ConfigureMenu (Bar bar)
{
var shortcut1 = new Shortcut
Shortcut shortcut1 = new ()
{
Title = "Z_igzag",
Key = Key.I.WithCtrl,
@@ -448,7 +452,7 @@ public class Bars : Scenario
HighlightStates = MouseState.In
};
var shortcut2 = new Shortcut
Shortcut shortcut2 = new ()
{
Title = "Za_G",
Text = "Gonna zag",
@@ -456,7 +460,7 @@ public class Bars : Scenario
HighlightStates = MouseState.In
};
var shortcut3 = new Shortcut
Shortcut shortcut3 = new ()
{
Title = "_Three",
Text = "The 3rd item",
@@ -464,13 +468,13 @@ public class Bars : Scenario
HighlightStates = MouseState.In
};
var line = new Line ()
Line line = new ()
{
X = -1,
Width = Dim.Fill ()! + 1
};
var shortcut4 = new Shortcut
Shortcut shortcut4 = new ()
{
Title = "_Four",
Text = "Below the line",
@@ -478,39 +482,40 @@ public class Bars : Scenario
HighlightStates = MouseState.In
};
shortcut4.CommandView = new CheckBox ()
shortcut4.CommandView = new CheckBox
{
Title = shortcut4.Title,
HighlightStates = MouseState.None,
CanFocus = false
};
// This ensures the checkbox state toggles when the hotkey of Title is pressed.
shortcut4.Accepting += (sender, args) => args.Handled = true;
shortcut4.Accepting += (_, args) => args.Handled = true;
bar.Add (shortcut1, shortcut2, shortcut3, line, shortcut4);
}
public void ConfigStatusBar (Bar bar)
{
var shortcut = new Shortcut
Shortcut shortcut = new ()
{
Text = "Quit",
Title = "Q_uit",
Key = Key.Z.WithCtrl,
Key = Key.Z.WithCtrl
};
bar.Add (shortcut);
shortcut = new Shortcut
shortcut = new ()
{
Text = "Help Text",
Title = "Help",
Key = Key.F1,
Key = Key.F1
};
bar.Add (shortcut);
shortcut = new Shortcut
shortcut = new ()
{
Title = "_Show/Hide",
Key = Key.F10,
@@ -518,45 +523,48 @@ public class Bars : Scenario
{
CanFocus = false,
Text = "_Show/Hide"
},
}
};
bar.Add (shortcut);
var button1 = new Button
Button button1 = new ()
{
Text = "I'll Hide",
Text = "I'll Hide"
// Visible = false
};
button1.Accepting += Button_Clicked;
button1.Accepting += ButtonClicked;
bar.Add (button1);
shortcut.Accepting += (s, e) =>
{
button1.Visible = !button1.Visible;
button1.Enabled = button1.Visible;
e.Handled = true;
};
shortcut.Accepting += (_, e) =>
{
button1.Visible = !button1.Visible;
button1.Enabled = button1.Visible;
e.Handled = true;
};
bar.Add (new Label
{
HotKeySpecifier = new Rune ('_'),
Text = "Fo_cusLabel",
CanFocus = true
});
bar.Add (
new Label
{
HotKeySpecifier = new ('_'),
Text = "Fo_cusLabel",
CanFocus = true
});
var button2 = new Button
Button middleButton = new ()
{
Text = "Or me!",
Text = "Or me!"
};
button2.Accepting += (s, e) => Application.RequestStop ();
middleButton.Accepting += (s, _) => (s as View)?.App!.RequestStop ();
bar.Add (button2);
bar.Add (middleButton);
return;
void Button_Clicked (object sender, EventArgs e) { MessageBox.Query ((sender as View)?.App, "Hi", $"You clicked {sender}"); }
static void ButtonClicked (object sender, EventArgs e)
{
MessageBox.Query ((sender as View)?.App!, "Hi", $"You clicked {sender}");
}
}
}