Bladeren bron

Cleand up warnings

Tig 1 jaar geleden
bovenliggende
commit
6b35abc790

+ 1 - 1
Terminal.Gui/ConsoleDrivers/EscSeqUtils/EscSeqUtils.cs

@@ -775,7 +775,7 @@ public static class EscSeqUtils
             lastMouseButtonPressed = buttonState;
             lastMouseButtonPressed = buttonState;
             isButtonPressed = true;
             isButtonPressed = true;
 
 
-            point ??= pos;
+            point = pos;
 
 
             if ((mouseFlags [0] & MouseFlags.ReportMousePosition) == 0)
             if ((mouseFlags [0] & MouseFlags.ReportMousePosition) == 0)
             {
             {

+ 10 - 4
UICatalog/Scenarios/ASCIICustomButton.cs

@@ -18,7 +18,6 @@ public class ASCIICustomButtonTest : Scenario
     {
     {
         Application.Init ();
         Application.Init ();
         Toplevel top = new ();
         Toplevel top = new ();
-        _scrollViewTestWindow = new ScrollViewTestWindow ();
 
 
         var menu = new MenuBar
         var menu = new MenuBar
         {
         {
@@ -51,7 +50,9 @@ public class ASCIICustomButtonTest : Scenario
                                 )
                                 )
             ]
             ]
         };
         };
-        top = new ();
+
+        _scrollViewTestWindow = new ScrollViewTestWindow ();
+
         top.Add (menu, _scrollViewTestWindow);
         top.Add (menu, _scrollViewTestWindow);
         Application.Run (top);
         Application.Run (top);
         top.Dispose ();
         top.Dispose ();
@@ -202,7 +203,7 @@ public class ASCIICustomButtonTest : Scenario
                     Width = BUTTON_WIDTH,
                     Width = BUTTON_WIDTH,
                     Height = BUTTON_HEIGHT
                     Height = BUTTON_HEIGHT
                 };
                 };
-                button.CustomInitialize ();
+                button.Initialized += Button_Initialized;
                 button.Accept += Button_Clicked;
                 button.Accept += Button_Clicked;
                 button.PointerEnter += Button_PointerEnter;
                 button.PointerEnter += Button_PointerEnter;
                 button.MouseClick += Button_MouseClick;
                 button.MouseClick += Button_MouseClick;
@@ -221,7 +222,7 @@ public class ASCIICustomButtonTest : Scenario
                 Width = BUTTON_WIDTH,
                 Width = BUTTON_WIDTH,
                 Height = BUTTON_HEIGHT
                 Height = BUTTON_HEIGHT
             };
             };
-            closeButton.CustomInitialize ();
+            closeButton.Initialized += Button_Initialized;
             closeButton.Accept += Button_Clicked;
             closeButton.Accept += Button_Clicked;
             closeButton.PointerEnter += Button_PointerEnter;
             closeButton.PointerEnter += Button_PointerEnter;
             closeButton.MouseClick += Button_MouseClick;
             closeButton.MouseClick += Button_MouseClick;
@@ -247,6 +248,11 @@ public class ASCIICustomButtonTest : Scenario
                 Add (titleLabel, _scrollView);
                 Add (titleLabel, _scrollView);
             }
             }
         }
         }
+        private void Button_Initialized (object sender, EventArgs e)
+        {
+            var button = sender as ASCIICustomButton;
+            button?.CustomInitialize ();
+        }
 
 
         private void Button_Clicked (object sender, EventArgs e)
         private void Button_Clicked (object sender, EventArgs e)
         {
         {