forked from AvaloniaUI/Avalonia
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request AvaloniaUI#8415 from AvaloniaUI/backport/8405
Backport macOS windowing fixes.
- Loading branch information
Showing
18 changed files
with
563 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <Application xmlns="https://github.com/avaloniaui" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| x:Class="IntegrationTestApp.App"> | ||
| <Application.Styles> | ||
| <FluentTheme Mode="Light"/> | ||
| </Application.Styles> | ||
| </Application> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| using Avalonia; | ||
| using Avalonia.Controls.ApplicationLifetimes; | ||
| using Avalonia.Markup.Xaml; | ||
|
|
||
| namespace IntegrationTestApp | ||
| { | ||
| public class App : Application | ||
| { | ||
| public override void Initialize() | ||
| { | ||
| AvaloniaXamlLoader.Load(this); | ||
| } | ||
|
|
||
| public override void OnFrameworkInitializationCompleted() | ||
| { | ||
| if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) | ||
| { | ||
| desktop.MainWindow = new MainWindow(); | ||
| } | ||
|
|
||
| base.OnFrameworkInitializationCompleted(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <OutputType>WinExe</OutputType> | ||
| <TargetFramework>net6.0</TargetFramework> | ||
| <Nullable>enable</Nullable> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <CFBundleName>IntegrationTestApp</CFBundleName> | ||
| <CFBundleIdentifier>net.avaloniaui.avalonia.integrationtestapp</CFBundleIdentifier> | ||
| <NSHighResolutionCapable>true</NSHighResolutionCapable> | ||
| <CFBundleShortVersionString>1.0.0</CFBundleShortVersionString> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Dotnet.Bundle" Version="0.9.13" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" /> | ||
| <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <Import Project="..\..\build\BuildTargets.targets" /> | ||
| <Import Project="..\..\build\SampleApp.props" /> | ||
| <Import Project="..\..\build\ReferenceCoreLibraries.props" /> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| <Window xmlns="https://github.com/avaloniaui" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||
| xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||
| mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" | ||
| x:Class="IntegrationTestApp.MainWindow" | ||
| Name="MainWindow" | ||
| Title="IntegrationTestApp"> | ||
| <NativeMenu.Menu> | ||
| <NativeMenu> | ||
| <NativeMenuItem Header="File"> | ||
| <NativeMenu> | ||
| <NativeMenuItem Header="Open..."/> | ||
| </NativeMenu> | ||
| </NativeMenuItem> | ||
| <NativeMenuItem Header="View"> | ||
| <NativeMenu/> | ||
| </NativeMenuItem> | ||
| </NativeMenu> | ||
| </NativeMenu.Menu> | ||
| <DockPanel> | ||
| <NativeMenuBar DockPanel.Dock="Top"/> | ||
|
|
||
| <TabControl TabStripPlacement="Left" Name="MainTabs"> | ||
| <TabItem Header="Automation"> | ||
| <StackPanel> | ||
| <TextBlock Name="TextBlockWithName">TextBlockWithName</TextBlock> | ||
| <TextBlock Name="NotTheAutomationId"> | ||
| TextBlockWithNameAndAutomationId | ||
| </TextBlock> | ||
| <TextBlock Name="TextBlockAsLabel">Label for TextBox</TextBlock> | ||
| <TextBox Name="LabeledByTextBox"> | ||
| Foo | ||
| </TextBox> | ||
| </StackPanel> | ||
| </TabItem> | ||
|
|
||
| <TabItem Header="Button"> | ||
| <StackPanel> | ||
| <Button Name="DisabledButton" IsEnabled="False"> | ||
| Disabled Button | ||
| </Button> | ||
| <Button Name="BasicButton"> | ||
| Basic Button | ||
| </Button> | ||
| <Button Name="ButtonWithTextBlock"> | ||
| <TextBlock>Button with TextBlock</TextBlock> | ||
| </Button> | ||
| <Button Name="ButtonWithAcceleratorKey" HotKey="Ctrl+B">Button with Accelerator Key</Button> | ||
| </StackPanel> | ||
| </TabItem> | ||
|
|
||
| <TabItem Header="CheckBox"> | ||
| <StackPanel> | ||
| <CheckBox Name="UncheckedCheckBox">Unchecked</CheckBox> | ||
| <CheckBox Name="CheckedCheckBox" IsChecked="True">Checked</CheckBox> | ||
| <CheckBox Name="ThreeStateCheckBox" IsThreeState="True" IsChecked="{x:Null}">ThreeState</CheckBox> | ||
| </StackPanel> | ||
| </TabItem> | ||
|
|
||
| <TabItem Header="ComboBox"> | ||
| <StackPanel> | ||
| <ComboBox Name="BasicComboBox"> | ||
| <ComboBoxItem>Item 0</ComboBoxItem> | ||
| <ComboBoxItem>Item 1</ComboBoxItem> | ||
| </ComboBox> | ||
| <Button Name="ComboBoxSelectionClear">Clear Selection</Button> | ||
| <Button Name="ComboBoxSelectFirst">Select First</Button> | ||
| </StackPanel> | ||
| </TabItem> | ||
|
|
||
| <TabItem Header="ListBox"> | ||
| <DockPanel> | ||
| <StackPanel DockPanel.Dock="Bottom"> | ||
| <Button Name="ListBoxSelectionClear">Clear Selection</Button> | ||
| </StackPanel> | ||
| <ListBox Name="BasicListBox" Items="{Binding ListBoxItems}" SelectionMode="Multiple"/> | ||
| </DockPanel> | ||
| </TabItem> | ||
|
|
||
| <TabItem Header="Menu"> | ||
| <DockPanel> | ||
| <Menu DockPanel.Dock="Top"> | ||
| <MenuItem Name="RootMenuItem" Header="_Root"> | ||
| <MenuItem Name="Child1MenuItem" Header="_Child 1" InputGesture="Ctrl+O" Click="MenuClicked"/> | ||
| <MenuItem Name="Child2MenuItem" Header="C_hild 2"> | ||
| <MenuItem Name="GrandchildMenuItem" Header="_Grandchild" Click="MenuClicked"/> | ||
| </MenuItem> | ||
| </MenuItem> | ||
| </Menu> | ||
| <StackPanel> | ||
| <TextBlock Name="ClickedMenuItem">None</TextBlock> | ||
| <Button Name="MenuClickedMenuItemReset">Reset</Button> | ||
| <TextBox Name="MenuFocusTest"/> | ||
| </StackPanel> | ||
| </DockPanel> | ||
| </TabItem> | ||
|
|
||
| <TabItem Header="Window"> | ||
| <StackPanel> | ||
| <TextBox Name="ShowWindowSize" Watermark="Window Size"/> | ||
| <ComboBox Name="ShowWindowMode" SelectedIndex="0"> | ||
| <ComboBoxItem>NonOwned</ComboBoxItem> | ||
| <ComboBoxItem>Owned</ComboBoxItem> | ||
| <ComboBoxItem>Modal</ComboBoxItem> | ||
| </ComboBox> | ||
| <ComboBox Name="ShowWindowLocation" SelectedIndex="0"> | ||
| <ComboBoxItem>Manual</ComboBoxItem> | ||
| <ComboBoxItem>CenterScreen</ComboBoxItem> | ||
| <ComboBoxItem>CenterOwner</ComboBoxItem> | ||
| </ComboBox> | ||
| <Button Name="ShowWindow">Show Window</Button> | ||
| <Button Name="SendToBack">Send to Back</Button> | ||
| <Button Name="ExitFullscreen">Exit Fullscreen</Button> | ||
| <Button Name="RestoreAll">Restore All</Button> | ||
| </StackPanel> | ||
| </TabItem> | ||
| </TabControl> | ||
| </DockPanel> | ||
| </Window> |
Oops, something went wrong.