Revert "revert control catalog changes."

This reverts commit d24903957e.

samples/ControlCatalog/Pages/CheckBoxPage.xaml

@@ -1,28 +1,25 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Pages.CheckBoxPage">
+             x:Class="ControlCatalog.Pages.CheckBoxPage" Background="White">
-  <StackPanel Orientation="Vertical" Spacing="4">
+  <Grid>
-    <TextBlock Classes="h2">A check box control</TextBlock>
+    <TextBlock x:Name="myTb" />
+    <ToggleButton x:Name="TogglePopupButton" Height="30" Width="150" HorizontalAlignment="Left">
+      <StackPanel>
+        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">
+          <Run Text="Is button toggled? " />
+          <Run Text="{Binding IsChecked, ElementName=TogglePopupButton}" />
+        </TextBlock>
 
-    <StackPanel Orientation="Horizontal"
+        <Popup Name="myPopup" IsOpen="{Binding IsChecked, ElementName=TogglePopupButton}">
-                Margin="0,16,0,0"
+          <Panel>
-                HorizontalAlignment="Center"
+            <Border BorderThickness="1" IsHitTestVisible="False" Margin="0" BorderBrush="Red" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" />
-                Spacing="16">
+
-      <StackPanel Orientation="Vertical"
+            <TextBlock Name="myPopupText" Background="LightBlue" Foreground="Blue" Padding="30" Margin="150">
-                  Spacing="16">
+              Popup Text
-        <CheckBox>_Unchecked</CheckBox>
+            </TextBlock>
-        <CheckBox IsChecked="True">_Checked</CheckBox>
+          </Panel>
-        <CheckBox IsChecked="{x:Null}">_Indeterminate</CheckBox>
+        </Popup>
-        <CheckBox IsChecked="True" IsEnabled="False">Disabled</CheckBox>
-      </StackPanel>
-      <StackPanel Orientation="Vertical"
-                  HorizontalAlignment="Center"
-                  Spacing="16">
-        <CheckBox IsChecked="False" IsThreeState="True">Three State: Unchecked</CheckBox>
-        <CheckBox IsChecked="True" IsThreeState="True">Three State: Checked</CheckBox>
-        <CheckBox IsChecked="{x:Null}" IsThreeState="True">Three State: Indeterminate</CheckBox>
-        <CheckBox IsChecked="{x:Null}" IsThreeState="True" IsEnabled="False">Three State: Disabled</CheckBox>
       </StackPanel>
-    </StackPanel>
+    </ToggleButton>
-  </StackPanel>
+  </Grid>
 </UserControl>

samples/ControlCatalog/Pages/CheckBoxPage.xaml.cs

@@ -1,18 +1,32 @@
 using Avalonia.Controls;
+using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 
 namespace ControlCatalog.Pages
 {
-    public class CheckBoxPage : UserControl
+    public partial class CheckBoxPage : UserControl
     {
+        private TextBlock myTb;
+        private int count;
+
         public CheckBoxPage()
         {
             this.InitializeComponent();
+
+            myTb = this.FindControl<TextBlock>("myTb");
+
         }
 
         private void InitializeComponent()
         {
             AvaloniaXamlLoader.Load(this);
         }
+
+        protected override void OnPointerMoved(PointerEventArgs e)
+        {
+            base.OnPointerMoved(e);
+
+            myTb.Text = e.GetPosition(this).ToString() + ", " + count++;
+        }
     }
 }