From b7568940c82848621bdcffa9b37af6665f75c821 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 25 May 2023 19:48:20 +0100
Subject: [PATCH] revert changes.

---
 .../ControlCatalog/Pages/CheckBoxPage.xaml    | 43 ++++++++++---------
 .../ControlCatalog/Pages/CheckBoxPage.xaml.cs | 16 +------
 .../Controls/PopupRoot.xaml                   | 14 +++---
 3 files changed, 31 insertions(+), 42 deletions(-)

diff --git a/samples/ControlCatalog/Pages/CheckBoxPage.xaml b/samples/ControlCatalog/Pages/CheckBoxPage.xaml
index 78a8ff5550..2f60fc5dae 100644
--- a/samples/ControlCatalog/Pages/CheckBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/CheckBoxPage.xaml
@@ -1,25 +1,28 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Pages.CheckBoxPage" Background="White">
-  <Grid>
-    <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>
+             x:Class="ControlCatalog.Pages.CheckBoxPage">
+  <StackPanel Orientation="Vertical" Spacing="4">
+    <TextBlock Classes="h2">A check box control</TextBlock>
 
-        <Popup Name="myPopup" IsOpen="{Binding IsChecked, ElementName=TogglePopupButton}">
-          <Panel>
-            <Border BorderThickness="1" IsHitTestVisible="False" Margin="0" BorderBrush="Red" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" />
-
-            <TextBlock Name="myPopupText" Background="LightBlue" Foreground="Blue" Padding="30" Margin="150">
-              Popup Text
-            </TextBlock>
-          </Panel>
-        </Popup>
+    <StackPanel Orientation="Horizontal"
+                Margin="0,16,0,0"
+                HorizontalAlignment="Center"
+                Spacing="16">
+      <StackPanel Orientation="Vertical"
+                  Spacing="16">
+        <CheckBox>_Unchecked</CheckBox>
+        <CheckBox IsChecked="True">_Checked</CheckBox>
+        <CheckBox IsChecked="{x:Null}">_Indeterminate</CheckBox>
+        <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>
-    </ToggleButton>
-  </Grid>
+    </StackPanel>
+  </StackPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/CheckBoxPage.xaml.cs b/samples/ControlCatalog/Pages/CheckBoxPage.xaml.cs
index 60e75561e1..5027c94f5e 100644
--- a/samples/ControlCatalog/Pages/CheckBoxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/CheckBoxPage.xaml.cs
@@ -1,32 +1,18 @@
 using Avalonia.Controls;
-using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 
 namespace ControlCatalog.Pages
 {
-    public partial class CheckBoxPage : UserControl
+    public 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++;
-        }
     }
 }
diff --git a/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
index 87e954b630..5a924830b1 100644
--- a/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
@@ -13,13 +13,13 @@
         <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
           <Panel>
             <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
-              <VisualLayerManager IsPopup="True">
-                <ContentPresenter Name="PART_ContentPresenter"
-                                  Background="{TemplateBinding Background}"
-                                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                                  Content="{TemplateBinding Content}"
-                                  Padding="{TemplateBinding Padding}" />
-              </VisualLayerManager>
+            <VisualLayerManager IsPopup="True">
+              <ContentPresenter Name="PART_ContentPresenter"
+                                Background="{TemplateBinding Background}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Content="{TemplateBinding Content}"
+                                Padding="{TemplateBinding Padding}" />
+            </VisualLayerManager>
           </Panel>
         </LayoutTransformControl>
       </ControlTemplate>