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 pull request #1397 from BDisp/uicatalog-focus-fix

Browse Source 
Fixes #1396. Using the Loaded event instead the Ready event.
This commit is contained in:
Charlie Kindel
2021-08-04 22:53:40 -06:00
committed by GitHub
parent 5a1c8a7cda f1f86c4288
commit a660f21e3f
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
UICatalog/UICatalog.cs
View File

@@ -273,20 +273,31 @@ namespace UICatalog {
_top.Add (_rightPane);
_top.Add (_statusBar);
_top.Loaded += () => {
void TopHandler () {
if (_runningScenario != null) {
_runningScenario = null;
_isFirstRunning = false;
}
};
void ReadyHandler ()
{
if (!_isFirstRunning) {
_rightPane.SetFocus ();
}
_top.Ready -= ReadyHandler;
_top.Loaded -= TopHandler;
}
_top.Ready += ReadyHandler;
_top.Loaded += TopHandler;
// The following code was moved to the TopHandler event
// because in the MainLoop.EventsPending (wait)
// from the Application.RunLoop with the WindowsDriver
// the OnReady event is triggered due the Focus event.
// On CursesDriver and NetDriver the focus event won't be triggered
// and if it's possible I don't know how to do it.
//void ReadyHandler ()
//{
// if (!_isFirstRunning) {
// _rightPane.SetFocus ();
// }
// _top.Ready -= ReadyHandler;
//}
//_top.Ready += ReadyHandler;
Application.Run (_top);
return _runningScenario;