Merge branch 'v2_develop' into v2_3964_close-all-menus-with-modal-fix

tig · web-flow · commit 01fdda7392dd · 2025-03-08T15:55:38.000-07:00
diff --git a/UICatalog/Scenario.cs b/UICatalog/Scenario.cs
@@ -180,7 +180,7 @@ public BenchmarkResults EndBenchmark ()
     }
 
     private List<Key>? _demoKeys;
-    private int _currentDemoKey = 0;
+    private int _currentDemoKey;
 
     private void OnApplicationOnInitializedChanged (object? s, EventArgs<bool> a)
     {
@@ -233,7 +233,6 @@ private void OnApplicationNotifyNewRunState (object? sender, RunStateEventArgs e
     {
         SubscribeAllSubViews (Application.Top!);
 
-        _currentDemoKey = 0;
         _demoKeys = GetDemoKeyStrokes ();
 
         Application.AddTimeout (

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ public BenchmarkResults EndBenchmark ()`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`private List<Key>? _demoKeys;`
`183`		`- private int _currentDemoKey = 0;`
	`183`	`+ private int _currentDemoKey;`
`184`	`184`
`185`	`185`	`private void OnApplicationOnInitializedChanged (object? s, EventArgs<bool> a)`
`186`	`186`	`{`
`@@ -233,7 +233,6 @@ private void OnApplicationNotifyNewRunState (object? sender, RunStateEventArgs e`
`233`	`233`	`{`
`234`	`234`	`SubscribeAllSubViews (Application.Top!);`
`235`	`235`
`236`		`- _currentDemoKey = 0;`
`237`	`236`	`_demoKeys = GetDemoKeyStrokes ();`
`238`	`237`
`239`	`238`	`Application.AddTimeout (`