From 03243f96e6140bfa239e566305d772eee80ed73d Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Mon, 27 Jan 2025 17:07:00 -0800
Subject: [PATCH] Move PopupsPage to IntegrationTestApp

---
 samples/ControlCatalog/MainView.xaml                  |  3 ---
 samples/IntegrationTestApp/MainWindow.axaml.cs        |  1 +
 .../Pages/PopupsPage.axaml}                           |  6 +++---
 .../Pages/PopupsPage.axaml.cs}                        | 11 +++--------
 4 files changed, 7 insertions(+), 14 deletions(-)
 rename samples/{ControlCatalog/Pages/PopupsPage.xaml => IntegrationTestApp/Pages/PopupsPage.axaml} (82%)
 rename samples/{ControlCatalog/Pages/PopupsPage.xaml.cs => IntegrationTestApp/Pages/PopupsPage.axaml.cs} (94%)

diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index d86d2a98e6..e3eed5fb0e 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -139,9 +139,6 @@
       <TabItem Header="Pointers">
         <pages:PointersPage />
       </TabItem>
-      <TabItem Header="Popups">
-        <pages:PopupsPage />
-      </TabItem>
       <TabItem Header="ProgressBar">
         <pages:ProgressBarPage />
       </TabItem>
diff --git a/samples/IntegrationTestApp/MainWindow.axaml.cs b/samples/IntegrationTestApp/MainWindow.axaml.cs
index ee7c81bf22..f8b38796e9 100644
--- a/samples/IntegrationTestApp/MainWindow.axaml.cs
+++ b/samples/IntegrationTestApp/MainWindow.axaml.cs
@@ -93,6 +93,7 @@ namespace IntegrationTestApp
                 new("Slider", () => new SliderPage()),
                 new("Window Decorations", () => new WindowDecorationsPage()),
                 new("Window", () => new WindowPage()),
+                new("Popups", () => new PopupsPage()),
             ];
         }
     }
diff --git a/samples/ControlCatalog/Pages/PopupsPage.xaml b/samples/IntegrationTestApp/Pages/PopupsPage.axaml
similarity index 82%
rename from samples/ControlCatalog/Pages/PopupsPage.xaml
rename to samples/IntegrationTestApp/Pages/PopupsPage.axaml
index 2dedb0e019..73ba77c663 100644
--- a/samples/ControlCatalog/Pages/PopupsPage.xaml
+++ b/samples/IntegrationTestApp/Pages/PopupsPage.axaml
@@ -1,6 +1,6 @@
-<UserControl x:Class="ControlCatalog.Pages.PopupsPage"
-             xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="IntegrationTestApp.Pages.PopupsPage">
   
   <StackPanel Orientation="Vertical" Spacing="10">
     
diff --git a/samples/ControlCatalog/Pages/PopupsPage.xaml.cs b/samples/IntegrationTestApp/Pages/PopupsPage.axaml.cs
similarity index 94%
rename from samples/ControlCatalog/Pages/PopupsPage.xaml.cs
rename to samples/IntegrationTestApp/Pages/PopupsPage.axaml.cs
index 2b9449b0cf..d367ab0238 100644
--- a/samples/ControlCatalog/Pages/PopupsPage.xaml.cs
+++ b/samples/IntegrationTestApp/Pages/PopupsPage.axaml.cs
@@ -7,21 +7,16 @@ using Avalonia.Layout;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 
-namespace ControlCatalog.Pages;
+namespace IntegrationTestApp.Pages;
 
-public class PopupsPage : UserControl
+public partial class PopupsPage : UserControl
 {
     private Popup? _popup;
     private Popup? _topMostPopup;
+
     public PopupsPage()
     {
         InitializeComponent();
-
-    }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
     }
 
     private void ButtonLightDismiss_OnClick(object sender, RoutedEventArgs e)