fixed Scrlling scenario

UICatalog/Scenarios/Scrolling.cs

@@ -21,153 +21,67 @@ public class Scrolling : Scenario
         var label = new Label { X = 0, Y = 0 };
         app.Add (label);
 
-        var scrollView = new IScrollView
+        var demoView = new DemoView
         {
-            Id = "scrollView",
+            Id = "demoView",
             X = 2,
             Y = Pos.Bottom (label) + 1,
             Width = 60,
             Height = 20,
-            ColorScheme = Colors.ColorSchemes ["TopLevel"],
-            CanFocus = true,
-            BorderStyle = LineStyle.Heavy,
-            Arrangement = ViewArrangement.Resizable
         };
-        scrollView.SetContentSize (new (80, 25));
-        //scrollView.Padding.Thickness = new (1);
-        //scrollView.Padding.Diagnostics = ViewDiagnosticFlags.Ruler;
+        demoView.SetContentSize (new (80, 25));
 
-        View rulerView = new View ()
-        {
-            Height = Dim.Fill (),
-            Width = Dim.Fill (),
-        };
-        rulerView.Border.Thickness = new (1);
-        rulerView.Border.LineStyle = LineStyle.None;
-        rulerView.Border.Diagnostics = ViewDiagnosticFlags.Ruler;
-        rulerView.Border.ColorScheme = Colors.ColorSchemes ["Error"];
-
-        scrollView.Add (rulerView);
         label.Text =
-            $"{scrollView}\nContentSize: {scrollView.GetContentSize ()}\nViewport.Location: {scrollView.Viewport.Location}";
+            $"{demoView}\nContentSize: {demoView.GetContentSize ()}\nViewport.Location: {demoView.Viewport.Location}";
 
-        scrollView.ViewportChanged += (_, _) =>
+        demoView.ViewportChanged += (_, _) =>
                                       {
                                           label.Text =
-                                              $"{scrollView}\nContentSize: {scrollView.GetContentSize ()}\nViewport.Location: {scrollView.Viewport.Location}";
+                                              $"{demoView}\nContentSize: {demoView.GetContentSize ()}\nViewport.Location: {demoView.Viewport.Location}";
                                       };
 
-        var pressMeButton = new Button
-        {
-            X = 1,
-            Y = 1,
-            Text = "Press me!"
-        };
-        pressMeButton.Accepting += (s, e) => MessageBox.Query (20, 7, "MessageBox", "Neat?", "Yes", "No");
-        scrollView.Add (pressMeButton);
+        app.Add (demoView);
 
-        var aLongButton = new Button
-        {
-            X = Pos.Right (pressMeButton),
-            Y = Pos.Bottom (pressMeButton),
-
-            Text = "A very long button. Should be wide enough to demo clipping!"
-        };
-        aLongButton.Accepting += (s, e) => MessageBox.Query (20, 7, "MessageBox", "Neat?", "Yes", "No");
-        scrollView.Add (aLongButton);
-
-        scrollView.Add (
-                        new TextField
-                        {
-                            X = Pos.Left (pressMeButton),
-                            Y = Pos.Bottom (aLongButton) + 1,
-                            Width = 50,
-                            ColorScheme = Colors.ColorSchemes ["Dialog"],
-                            Text = "This is a test of..."
-                        }
-                       );
-
-        scrollView.Add (
-                        new TextField
-                        {
-                            X = Pos.Left (pressMeButton),
-                            Y = Pos.Bottom (aLongButton) + 3,
-                            Width = 50,
-                            ColorScheme = Colors.ColorSchemes ["Dialog"],
-                            Text = "... the emergency broadcast system."
-                        }
-                       );
-
-        scrollView.Add (
-                        new TextField
-                        {
-                            X = Pos.Left (pressMeButton),
-                            Y = 40,
-                            Width = 50,
-                            ColorScheme = Colors.ColorSchemes ["Error"],
-                            Text = "Last line"
-                        }
-                       );
-
-        // Demonstrate AnchorEnd - Button is anchored to bottom/right
-        var anchorButton = new Button
-        {
-            X = Pos.AnchorEnd (),
-            Y = Pos.AnchorEnd (),
-            Text = "Bottom Right"
-        };
-
-        anchorButton.Accepting += (s, e) =>
-                               {
-                                   // This demonstrates how to have a dynamically sized button
-                                   // Each time the button is clicked the button's text gets longer
-                                   anchorButton.Text += "!";
-
-                               };
-        scrollView.Add (anchorButton);
-
-        app.Add (scrollView);
-
-        scrollView.HorizontalScrollBar.Visible = true;
+        demoView.HorizontalScrollBar.Visible = true;
         var hCheckBox = new CheckBox
         {
-            X = Pos.X (scrollView),
-            Y = Pos.Bottom (scrollView),
+            X = Pos.X (demoView),
+            Y = Pos.Bottom (demoView),
             Text = "Horizontal Scrollbar",
-            CheckedState = scrollView.HorizontalScrollBar.Visible ? CheckState.Checked : CheckState.UnChecked
+            CheckedState = demoView.HorizontalScrollBar.Visible ? CheckState.Checked : CheckState.UnChecked
         };
         app.Add (hCheckBox);
         hCheckBox.CheckedStateChanged += (sender, args) =>
                                          {
-                                             scrollView.HorizontalScrollBar.Visible = args.CurrentValue == CheckState.Checked;
+                                             demoView.HorizontalScrollBar.Visible = args.CurrentValue == CheckState.Checked;
                                          };
 
-        scrollView.VerticalScrollBar.Visible = true;
+        demoView.VerticalScrollBar.Visible = true;
         var vCheckBox = new CheckBox
         {
             X = Pos.Right (hCheckBox) + 3,
-            Y = Pos.Bottom (scrollView),
+            Y = Pos.Bottom (demoView),
             Text = "Vertical Scrollbar",
-            CheckedState = scrollView.VerticalScrollBar.Visible ? CheckState.Checked : CheckState.UnChecked
+            CheckedState = demoView.VerticalScrollBar.Visible ? CheckState.Checked : CheckState.UnChecked
         };
         app.Add (vCheckBox);
         vCheckBox.CheckedStateChanged += (sender, args) =>
                                          {
-                                             scrollView.VerticalScrollBar.Visible = args.CurrentValue == CheckState.Checked;
+                                             demoView.VerticalScrollBar.Visible = args.CurrentValue == CheckState.Checked;
                                          };
 
         var t = "Auto Hide Scrollbars";
 
         var ahCheckBox = new CheckBox
         {
-            X = Pos.Left (scrollView), Y = Pos.Bottom (hCheckBox), Text = t,
-            CheckedState = scrollView.HorizontalScrollBar.AutoHide ? CheckState.Checked : CheckState.UnChecked
+            X = Pos.Left (demoView), Y = Pos.Bottom (hCheckBox), Text = t,
+            CheckedState = demoView.HorizontalScrollBar.AutoHide ? CheckState.Checked : CheckState.UnChecked
         };
 
         ahCheckBox.CheckedStateChanging += (s, e) =>
                               {
-                                  scrollView.HorizontalScrollBar.AutoHide = e.NewValue == CheckState.Checked;
-                                  scrollView.VerticalScrollBar.AutoHide = e.NewValue == CheckState.Checked;
+                                  demoView.HorizontalScrollBar.AutoHide = e.NewValue == CheckState.Checked;
+                                  demoView.VerticalScrollBar.AutoHide = e.NewValue == CheckState.Checked;
                                   hCheckBox.CheckedState = CheckState.Checked;
                                   vCheckBox.CheckedState = CheckState.Checked;
                               };
@@ -177,7 +91,7 @@ public class Scrolling : Scenario
 
         var mousePos = new Label
         {
-            X = Pos.Right (scrollView) + 1,
+            X = Pos.Right (demoView) + 1,
             Y = Pos.AnchorEnd (1),
 
             Width = 50,
@@ -187,7 +101,7 @@ public class Scrolling : Scenario
         Application.MouseEvent += (sender, a) => { mousePos.Text = $"Mouse: ({a.Position}) - {a.Flags} {count++}"; };
 
         // Add a progress bar to cause constant redraws
-        var progress = new ProgressBar { X = Pos.Right (scrollView) + 1, Y = Pos.AnchorEnd (2), Width = 50 };
+        var progress = new ProgressBar { X = Pos.Right (demoView) + 1, Y = Pos.AnchorEnd (2), Width = 50 };
 
         app.Add (progress);
 
@@ -204,7 +118,6 @@ public class Scrolling : Scenario
 
         app.Unloaded += app_Unloaded;
 
-
         Application.Run (app);
         app.Unloaded -= app_Unloaded;
         app.Dispose ();
@@ -219,7 +132,103 @@ public class Scrolling : Scenario
     }
 }
 
-public class IScrollView : View
+public class DemoView : View
 {
+    public DemoView ()
+    {
+        base.ColorScheme = Colors.ColorSchemes ["TopLevel"];
+        CanFocus = true;
+        BorderStyle = LineStyle.Heavy;
+        Arrangement = ViewArrangement.Resizable;
+
+        Initialized += OnInitialized;
+
+
+    }
 
+    private void OnInitialized (object sender, EventArgs e)
+    {
+        View rulerView = new View ()
+        {
+            Height = Dim.Fill (),
+            Width = Dim.Fill (),
+        };
+        rulerView.Border!.Thickness = new (1);
+        rulerView.Border.LineStyle = LineStyle.None;
+        rulerView.Border.Diagnostics = ViewDiagnosticFlags.Ruler;
+        rulerView.Border.ColorScheme = Colors.ColorSchemes ["Error"];
+
+        Add (rulerView);
+
+
+        var pressMeButton = new Button
+        {
+            X = 1,
+            Y = 1,
+            Text = "Press me!"
+        };
+        pressMeButton.Accepting += (s, e) => MessageBox.Query (20, 7, "MessageBox", "Neat?", "Yes", "No");
+        Add (pressMeButton);
+
+        var aLongButton = new Button
+        {
+            X = Pos.Right (pressMeButton),
+            Y = Pos.Bottom (pressMeButton),
+
+            Text = "A very long button. Should be wide enough to demo clipping!"
+        };
+        aLongButton.Accepting += (s, e) => MessageBox.Query (20, 7, "MessageBox", "Neat?", "Yes", "No");
+        Add (aLongButton);
+
+        Add (
+                        new TextField
+                        {
+                            X = Pos.Left (pressMeButton),
+                            Y = Pos.Bottom (aLongButton) + 1,
+                            Width = 50,
+                            ColorScheme = Colors.ColorSchemes ["Dialog"],
+                            Text = "This is a test of..."
+                        }
+                       );
+
+        Add (
+                        new TextField
+                        {
+                            X = Pos.Left (pressMeButton),
+                            Y = Pos.Bottom (aLongButton) + 3,
+                            Width = 50,
+                            ColorScheme = Colors.ColorSchemes ["Dialog"],
+                            Text = "... the emergency broadcast system."
+                        }
+                       );
+
+        Add (
+                        new TextField
+                        {
+                            X = Pos.Left (pressMeButton),
+                            Y = 40,
+                            Width = 50,
+                            ColorScheme = Colors.ColorSchemes ["Error"],
+                            Text = "Last line"
+                        }
+                       );
+
+        // Demonstrate AnchorEnd - Button is anchored to bottom/right
+        var anchorButton = new Button
+        {
+            X = Pos.AnchorEnd (),
+            Y = Pos.AnchorEnd (),
+            Text = "Bottom Right"
+        };
+
+        anchorButton.Accepting += (s, e) =>
+        {
+            // This demonstrates how to have a dynamically sized button
+            // Each time the button is clicked the button's text gets longer
+            anchorButton.Text += "!";
+
+        };
+        Add (anchorButton);
+
+    }
 }