Browse Source

Move PopupsPage to IntegrationTestApp

fix-popup-topmost-windows
Max Katz 1 year ago
parent
commit
03243f96e6
  1. 3
      samples/ControlCatalog/MainView.xaml
  2. 1
      samples/IntegrationTestApp/MainWindow.axaml.cs
  3. 6
      samples/IntegrationTestApp/Pages/PopupsPage.axaml
  4. 11
      samples/IntegrationTestApp/Pages/PopupsPage.axaml.cs

3
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>

1
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()),
];
}
}

6
samples/ControlCatalog/Pages/PopupsPage.xaml → 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">

11
samples/ControlCatalog/Pages/PopupsPage.xaml.cs → 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)
Loading…
Cancel
Save