Skip to content

Refactor: Simplify AppWindow sample windows logic #1834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
niels9001 merged 5 commits into from
Apr 16, 2025
Merged

Refactor: Simplify AppWindow sample windows logic #1834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7e2e917
refactor: simplify AppWindow sample windows logic
Zakariathr22 Apr 15, 2025
2500776
Fix AppWindow not showing after delay by using async/await in Show_Click
Zakariathr22 Apr 15, 2025
0fe1acb
Simplified the retrieval of the display area and the calculation of t…
Zakariathr22 Apr 15, 2025
4c37b44
Update PopupPage.xaml
niels9001 Apr 16, 2025
f4fe640
Revert "Update PopupPage.xaml"
niels9001 Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
239 changes: 92 additions & 147 deletions WinUIGallery/Samples/ControlPages/AppWindowPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,77 +90,56 @@
<TextBlock FontWeight="SemiBold"
Text="TitleBar theme" />
<ComboBox x:Name="TitleBarPreferredTheme"
ItemsSource="{x:Bind TitleBarThemes}"
SelectedItem="{x:Bind SelectedTheme, Mode=TwoWay}"
ItemsSource="{x:Bind titleBarThemes}"
SelectedItem="{x:Bind selectedTheme, Mode=TwoWay}"
HorizontalAlignment="Stretch" />
</StackPanel>
</controls:ControlExample.Options>

<controls:ControlExample.CSharp>
<x:String xml:space="preserve">
using System;
using Microsoft.UI;
using Microsoft.UI.Windowing;
using Microsoft.UI.Xaml;
using WinRT.Interop;

namespace YourNamespace;

public sealed partial class SampleWindow1 : Window
{
private AppWindow appWindow;

{
public SampleWindow1()
{
this.InitializeComponent();

// Retrieve the AppWindow instance for the current window
appWindow = GetAppWindowForCurrentWindow();

// Set the window title
appWindow.Title = "$(WindowTitle)";
AppWindow.Title = "$(WindowTitle)";

// Set the window size (including borders)
appWindow.Resize(new Windows.Graphics.SizeInt32($(Width), $(Height)));
AppWindow.Resize(new Windows.Graphics.SizeInt32($(Width), $(Height)));

// Set the window position on screen
appWindow.Move(new Windows.Graphics.PointInt32($(X), $(Y)));
AppWindow.Move(new Windows.Graphics.PointInt32($(X), $(Y)));

// Set the preferred theme for the title bar
appWindow.TitleBar.PreferredTheme = TitleBarTheme.$(TitleBarPreferredTheme);
AppWindow.TitleBar.PreferredTheme = TitleBarTheme.$(TitleBarPreferredTheme);

// Set the taskbar icon (displayed in the taskbar)
appWindow.SetTaskbarIcon("Assets/Tiles/GalleryIcon.ico");
AppWindow.SetTaskbarIcon("Assets/Tiles/GalleryIcon.ico");

// Set the title bar icon (displayed in the window's title bar)
appWindow.SetTitleBarIcon("Assets/Tiles/GalleryIcon.ico");
AppWindow.SetTitleBarIcon("Assets/Tiles/GalleryIcon.ico");

// Set the window icon (affects both taskbar and title bar, can be omitted if the above two are set)
// appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
}

//Returrns the AppWindow instance associated with the current window.
private AppWindow GetAppWindowForCurrentWindow()
{
// Get the native window handle
IntPtr hWnd = WindowNative.GetWindowHandle(this);

// Retrieve the WindowId from the window handle
WindowId myWndId = Win32Interop.GetWindowIdFromWindow(hWnd);

// Return the AppWindow instance associated with the given WindowId
return AppWindow.GetFromWindowId(myWndId);
// AppWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
}

private void Show_Click(object sender, RoutedEventArgs e)
{
appWindow.Hide();
Task.Delay(3000).ContinueWith(t => appWindow.Show());
AppWindow.Hide();
Task.Delay(3000).ContinueWith(t => AppWindow.Show());
}

private void Hide_Click(object sender, RoutedEventArgs e)
{
appWindow.Hide();
AppWindow.Hide();
}

private void Close_Click(object sender, RoutedEventArgs e)
Expand Down Expand Up @@ -288,48 +267,36 @@ public sealed partial class SampleWindow1 : Window
</controls:ControlExample.Options>
<controls:ControlExample.CSharp>
<x:String xml:space="preserve">
using System;
using Microsoft.UI;
using Microsoft.UI.Windowing;
using Microsoft.UI.Xaml;
using WinRT.Interop;
using System.Threading.Tasks;

namespace YourNamespace;

public sealed partial class SampleWindow3 : Window
{
private AppWindow appWindow;
private OverlappedPresenter presenter;

public SampleWindow3()
{
this.InitializeComponent();

appWindow = GetAppWindowForCurrentWindow();
appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
appWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;

presenter = OverlappedPresenter.Create();
AppWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;
OverlappedPresenter presenter = OverlappedPresenter.Create();

presenter.IsAlwaysOnTop = $(IsAlwaysOnTop);
presenter.IsMaximizable = $(IsMaximizable);
presenter.IsMinimizable = $(IsMinimizable);
presenter.IsResizable = $(IsResizable);
presenter.SetBorderAndTitleBar($(HasBorder),$(HasTitleBar));
presenter.SetBorderAndTitleBar($(HasBorder), $(HasTitleBar));

appWindow.SetPresenter(presenter);

SizeChanged += SampleWindow3_SizeChanged;
}
AppWindow.SetPresenter(presenter);

private AppWindow GetAppWindowForCurrentWindow()
{
IntPtr hWnd = WindowNative.GetWindowHandle(this);
WindowId myWndId = Win32Interop.GetWindowIdFromWindow(hWnd);
return AppWindow.GetFromWindowId(myWndId);
SizeChanged += SampleWindow3_SizeChanged;
}

private void MaximizeRestoreBtn_Click(object sender, RoutedEventArgs e)
{
OverlappedPresenter presenter = (OverlappedPresenter)AppWindow.Presenter;
if (presenter.State == OverlappedPresenterState.Maximized)
{
presenter.Restore();
Expand All @@ -342,16 +309,19 @@ public sealed partial class SampleWindow3 : Window

private void SampleWindow3_SizeChanged(object sender, WindowSizeChangedEventArgs e)
{
OverlappedPresenter presenter = (OverlappedPresenter)AppWindow.Presenter;
MaximizeRestoreBtn.Content = presenter.State == OverlappedPresenterState.Maximized ? "Restore" : "Maximize";
}

private void MinimizeBtn_Click(object sender, RoutedEventArgs e)
{
{
OverlappedPresenter presenter = (OverlappedPresenter)AppWindow.Presenter;
presenter.Minimize();
}

private void RestoreBtn_Click(object sender, RoutedEventArgs e)
{
OverlappedPresenter presenter = (OverlappedPresenter)AppWindow.Presenter;
presenter.Minimize();
Task.Delay(3000).ContinueWith(t => presenter.Restore());
}
Expand Down Expand Up @@ -403,60 +373,49 @@ public sealed partial class SampleWindow3 : Window
</controls:ControlExample.Options>
<controls:ControlExample.CSharp>
<x:String xml:space="preserve">
using System;
using Microsoft.UI;
using Microsoft.UI.Windowing;
using Microsoft.UI.Xaml;
using WinRT.Interop;

namespace YourNamespace;

public sealed partial class SampleWindow4 : Window
{
private AppWindow appWindow;
private OverlappedPresenter presenter;

public SampleWindow4()
{
this.InitializeComponent();

appWindow = GetAppWindowForCurrentWindow();
appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
appWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;

appWindow.Resize(new Windows.Graphics.SizeInt32(800, 500));
presenter = OverlappedPresenter.Create();
presenter.IsMaximizable = false;
presenter.PreferredMinimumWidth = $(MinWidth);
presenter.PreferredMinimumHeight = $(MinHeight);
presenter.PreferredMaximumWidth = $(MaxWidth);
presenter.PreferredMaximumHeight = $(MaxHeight);

appWindow.SetPresenter(presenter);
}

private AppWindow GetAppWindowForCurrentWindow()
{
IntPtr hWnd = WindowNative.GetWindowHandle(this);
WindowId myWndId = Win32Interop.GetWindowIdFromWindow(hWnd);
return AppWindow.GetFromWindowId(myWndId);
}

private void MinimizeBtn_Click(object sender, RoutedEventArgs e)
{
presenter.Minimize();
}

private void RestoreBtn_Click(object sender, RoutedEventArgs e)
{
presenter.Minimize();
Task.Delay(3000).ContinueWith(t => presenter.Restore());
}

private void CloseBtn_Click(object sender, RoutedEventArgs e)
{
this.Close();
}
using Microsoft.UI.Windowing;
using Microsoft.UI.Xaml;
using System.Threading.Tasks;

namespace WinUIGallery.Samples.SamplePages;

public sealed partial class SampleWindow4 : Window
{
public SampleWindow4(int MinWidth, int MinHeight, int MaxWidth, int MaxHeight)
{
this.InitializeComponent();

AppWindow.Resize(new Windows.Graphics.SizeInt32(800, 500));
AppWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;

OverlappedPresenter presenter = OverlappedPresenter.Create();
presenter.PreferredMinimumWidth = MinWidth;
presenter.PreferredMinimumHeight = MinHeight;
presenter.PreferredMaximumWidth = MaxWidth;
presenter.PreferredMaximumHeight = MaxHeight;
presenter.IsMaximizable = false;

AppWindow.SetPresenter(presenter);
}

private void MinimizeBtn_Click(object sender, RoutedEventArgs e)
{
OverlappedPresenter presenter = (OverlappedPresenter)AppWindow.Presenter;
presenter.Minimize();
}

private void RestoreBtn_Click(object sender, RoutedEventArgs e)
{
OverlappedPresenter presenter = (OverlappedPresenter)AppWindow.Presenter;
presenter.Minimize();
Task.Delay(3000).ContinueWith(t => presenter.Restore());
}

private void CloseBtn_Click(object sender, RoutedEventArgs e)
{
this.Close();
}
}
</x:String>
</controls:ControlExample.CSharp>
Expand Down Expand Up @@ -520,43 +479,29 @@ public sealed partial class SampleWindow4 : Window
</controls:ControlExample.Options>
<controls:ControlExample.CSharp>
<x:String xml:space="preserve">
using System;
using Microsoft.UI;
using Microsoft.UI.Windowing;
using Microsoft.UI.Xaml;
using WinRT.Interop;

namespace YourNamespace;

public sealed partial class SampleWindow7 : Window
{
private AppWindow appWindow;
private CompactOverlayPresenter presenter;

public SampleWindow7()
{
this.InitializeComponent();

appWindow = GetAppWindowForCurrentWindow();
appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
appWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;

// Creates a CompactOverlay (Picture-in-Picture) presenter
presenter = CompactOverlayPresenter.Create();

using Microsoft.UI.Windowing;
using Microsoft.UI.Xaml;

namespace YourNamespace;

public sealed partial class SampleWindow7 : Window
{
public SampleWindow7(string InitialSize)
{
this.InitializeComponent();

AppWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;

// Creates a CompactOverlay (Picture-in-Picture) presenter
CompactOverlayPresenter presenter = CompactOverlayPresenter.Create();

// Sets the initial size of the CompactOverlay window
presenter.InitialSize = CompactOverlaySize.$(InitialSize);

// Applies the CompactOverlay presenter to the window
appWindow.SetPresenter(presenter);
}

private AppWindow GetAppWindowForCurrentWindow()
{
IntPtr hWnd = WindowNative.GetWindowHandle(this);
WindowId myWndId = Win32Interop.GetWindowIdFromWindow(hWnd);
return AppWindow.GetFromWindowId(myWndId);
}
presenter.InitialSize = CompactOverlaySize.$(InitialSize);

// Applies the CompactOverlay presenter to the window
AppWindow.SetPresenter(presenter);
}
}
</x:String>
</controls:ControlExample.CSharp>
Expand Down
6 changes: 3 additions & 3 deletions WinUIGallery/Samples/ControlPages/AppWindowPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ namespace WinUIGallery.ControlPages;

public sealed partial class AppWindowPage : Page
{
private IReadOnlyList<TitleBarTheme> TitleBarThemes = Enum.GetValues(typeof(TitleBarTheme)).Cast<TitleBarTheme>().ToList();
private TitleBarTheme SelectedTheme = TitleBarTheme.UseDefaultAppMode;
private IReadOnlyList<TitleBarTheme> titleBarThemes = Enum.GetValues(typeof(TitleBarTheme)).Cast<TitleBarTheme>().ToList();
private TitleBarTheme selectedTheme = TitleBarTheme.UseDefaultAppMode;

public AppWindowPage()
{
Expand All @@ -21,7 +21,7 @@ public AppWindowPage()

private void ShowSampleWindow1(object sender, RoutedEventArgs e)
{
SampleWindow1 window = new SampleWindow1(WindowTitle.Text, (Int32)WindowWidth.Value, (Int32)WindowHeight.Value, (Int32)XPoint.Value, (Int32)YPoint.Value, SelectedTheme);
SampleWindow1 window = new SampleWindow1(WindowTitle.Text, (int)WindowWidth.Value, (int)WindowHeight.Value, (int)XPoint.Value, (int)YPoint.Value, selectedTheme);
window.Activate();
}

Expand Down
Loading