Resolving merge conflicts.

This commit is contained in:
BDisp
2023-03-17 11:24:53 +00:00
51 changed files with 301 additions and 157 deletions

View File

@@ -85,7 +85,7 @@ namespace UICatalog.Scenarios {
miWrap.Checked = textViewTopLeft.WordWrap;
var statusBar = new StatusBar (new StatusItem [] {
new StatusItem(Key.CtrlMask | Key.Q, "~^Q~ Quit", () => Quit()),
new StatusItem(Application.QuitKey, $"{Application.QuitKey} to Quit", () => Quit()),
siMultiline = new StatusItem(Key.Null, "", null),
siWrap = new StatusItem(Key.Null, "", null)
});