Skip to content

Fix inconsistencies and noop buttons in AppWindow samples #1824

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 4 commits into from
Apr 2, 2025
Merged

Fix inconsistencies and noop buttons in AppWindow samples #1824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a53229
Add icon to app window sample windows
marcelwgn Apr 2, 2025
d446569
Update show/restore buttons for improved sample behavior
marcelwgn Apr 2, 2025
5c92729
Update sample code
marcelwgn Apr 2, 2025
839e879
CR feedback
marcelwgn Apr 2, 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
10 changes: 8 additions & 2 deletions WinUIGallery/Samples/ControlPages/AppWindowPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,8 @@ public sealed partial class SampleWindow1 : Window

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

private void Hide_Click(object sender, RoutedEventArgs e)
Expand Down Expand Up @@ -288,6 +289,7 @@ public sealed partial class SampleWindow3 : Window
this.InitializeComponent();

appWindow = GetAppWindowForCurrentWindow();
appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");

presenter = OverlappedPresenter.Create();
presenter.IsAlwaysOnTop = $(IsAlwaysOnTop);
Expand Down Expand Up @@ -386,6 +388,8 @@ public sealed partial class SampleWindow4 : Window
this.InitializeComponent();

appWindow = GetAppWindowForCurrentWindow();
appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");

appWindow.Resize(new Windows.Graphics.SizeInt32(800, 500));
presenter = OverlappedPresenter.Create();
presenter.IsMaximizable = false;
Expand Down Expand Up @@ -416,7 +420,8 @@ public sealed partial class SampleWindow4 : Window

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

private void CloseBtn_Click(object sender, RoutedEventArgs e)
Expand Down Expand Up @@ -504,6 +509,7 @@ public sealed partial class SampleWindow7 : Window
this.InitializeComponent();

appWindow = GetAppWindowForCurrentWindow();
appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");

// Creates a CompactOverlay (Picture-in-Picture) presenter
presenter = CompactOverlayPresenter.Create();
Expand Down
41 changes: 34 additions & 7 deletions WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample1_xaml.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,42 @@
<MicaBackdrop />
</Window.SystemBackdrop>

<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="8">
<Button x:Name="Show" Content="Show" Click="Show_Click" Width="150" />
<Button x:Name="Hide" Content="Hide" Click="Hide_Click" Width="150" />

<Button x:Name="Close" Click="Close_Click" Width="150" Margin="0,16,0,0">
<StackPanel HorizontalAlignment="Center"
VerticalAlignment="Center"
Spacing="8">
<Button x:Name="Hide"
Content="Hide"
Click="Hide_Click"
Width="200">
<ToolTipService.ToolTip>
<TextBlock Text="Hides the window from all UX representations in the system but keeps the object alive."
TextWrapping="Wrap" />
</ToolTipService.ToolTip>
</Button>
<Button x:Name="Show"
Click="Show_Click"
Width="200" >
<ToolTipService.ToolTip>
<TextBlock Text="Hides and then shows the window and activates it after 3 seconds."
TextWrapping="Wrap" />
</ToolTipService.ToolTip>
<TextBlock Text="Hide and show the window after 3 seconds" TextWrapping="WrapWholeWords" TextAlignment="Center"/>
</Button>
<Button x:Name="Close"
Click="Close_Click"
Width="200"
Margin="0,16,0,0">
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
<SymbolIcon Symbol="Cancel" Margin="0,0,4,0" Foreground="{ThemeResource SystemFillColorCriticalBrush}" />
<TextBlock Text="Close" Foreground="{ThemeResource SystemFillColorCriticalBrush}" />
<SymbolIcon Symbol="Cancel"
Foreground="{ThemeResource SystemFillColorCriticalBrush}"
Margin="0,0,4,0" />
<TextBlock Text="Close"
Foreground="{ThemeResource SystemFillColorCriticalBrush}" />
</StackPanel>
<ToolTipService.ToolTip>
<TextBlock Text="Closes the window and releases all resources."
TextWrapping="Wrap" />
</ToolTipService.ToolTip>
</Button>
</StackPanel>
</Window>
1 change: 1 addition & 0 deletions WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample2_cs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public sealed partial class SampleWindow2 : Window
{
this.InitializeComponent();
appWindow = GetAppWindowForCurrentWindow();
appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");

// Center the window on the screen.
CenterWindow(appWindow);
Expand Down
36 changes: 27 additions & 9 deletions WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample3_xaml.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,33 @@
<MicaBackdrop />
</Window.SystemBackdrop>

<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="8">
<Button x:Name="MaximizeBtn" Content="Maximize" Click="MaximizeBtn_Click" Width="150" />
<Button x:Name="RestoreBtn" Content="Restore" Click="RestoreBtn_Click" Width="150" />
<Button x:Name="MinimizeBtn" Content="Minimize" Click="MinimizeBtn_Click" Width="150" />

<Button x:Name="CloseBtn" Click="CloseBtn_Click" Width="150" Margin="0,16,0,0">
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
<SymbolIcon Symbol="Cancel" Margin="0,0,4,0" Foreground="{ThemeResource SystemFillColorCriticalBrush}" />
<TextBlock Text="Close" Foreground="{ThemeResource SystemFillColorCriticalBrush}" />
<StackPanel HorizontalAlignment="Center"
VerticalAlignment="Center"
Spacing="10">
<Button x:Name="MaximizeBtn"
Content="Maximize"
Click="MaximizeBtn_Click"
Width="200" />
<Button x:Name="MinimizeBtn"
Content="Minimize"
Click="MinimizeBtn_Click"
Width="200" />
<Button x:Name="RestoreBtn"
Click="RestoreBtn_Click"
Width="200" >
<TextBlock Text="Minimize and restore the window after 3 seconds" TextWrapping="WrapWholeWords" TextAlignment="Center"/>
</Button>
<Button x:Name="CloseBtn"
Click="CloseBtn_Click"
Width="200"
Margin="0,16,0,0">
<StackPanel Orientation="Horizontal"
VerticalAlignment="Center">
<SymbolIcon Symbol="Cancel"
Margin="0,0,4,0"
Foreground="{ThemeResource SystemFillColorCriticalBrush}" />
<TextBlock Text="Close"
Foreground="{ThemeResource SystemFillColorCriticalBrush}" />
</StackPanel>
</Button>
</StackPanel>
Expand Down
1 change: 1 addition & 0 deletions WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample6_cs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public sealed partial class SampleWindow6 : Window
{
this.InitializeComponent();
appWindow = GetAppWindowForCurrentWindow();
appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");

// Set the window to Full-Screen mode
appWindow.SetPresenter(AppWindowPresenterKind.FullScreen);
Expand Down
23 changes: 17 additions & 6 deletions WinUIGallery/Samples/SampleCode/AppWindow/AppWindowSample6_xaml.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,23 @@
<MicaBackdrop />
</Window.SystemBackdrop>

<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="8">
<TextBlock Text="This window is running in Fullscreen mode" Style="{ThemeResource TitleTextBlockStyle}" TextAlignment="Center" />
<Button x:Name="Close" Click="Close_Click" Width="150" HorizontalAlignment="Center">
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
<SymbolIcon Symbol="Cancel" Foreground="{ThemeResource SystemFillColorCriticalBrush}" Margin="0,0,4,0" />
<TextBlock Text="Close" Foreground="{ThemeResource SystemFillColorCriticalBrush}" />
<StackPanel HorizontalAlignment="Center"
VerticalAlignment="Center"
Spacing="8">
<TextBlock Text="This window is running in Fullscreen mode"
Style="{ThemeResource TitleTextBlockStyle}"
TextAlignment="Center" />
<Button x:Name="Close"
Click="Close_Click"
Width="200"
HorizontalAlignment="Center">
<StackPanel Orientation="Horizontal"
VerticalAlignment="Center">
<SymbolIcon Symbol="Cancel"
Foreground="{ThemeResource SystemFillColorCriticalBrush}"
Margin="0,0,4,0" />
<TextBlock Text="Close"
Foreground="{ThemeResource SystemFillColorCriticalBrush}" />
</StackPanel>
</Button>
</StackPanel>
Expand Down
3 changes: 2 additions & 1 deletion WinUIGallery/Samples/SamplePages/ModalWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ public ModalWindow()
{
this.InitializeComponent();
appWindow = GetAppWindowForCurrentWindow();
appWindow.Resize(new Windows.Graphics.SizeInt32(400,300));
appWindow.Resize(new Windows.Graphics.SizeInt32(400,300));
appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");

OverlappedPresenter presenter = OverlappedPresenter.CreateForDialog();

Expand Down
23 changes: 11 additions & 12 deletions WinUIGallery/Samples/SamplePages/SampleWindow1.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,27 @@
<StackPanel HorizontalAlignment="Center"
VerticalAlignment="Center"
Spacing="8">
<Button x:Name="Show"
Content="Show"
Click="Show_Click"
Width="150">
<ToolTipService.ToolTip>
<TextBlock Text="Shows the window and activates it."
TextWrapping="Wrap" />
</ToolTipService.ToolTip>
</Button>
<Button x:Name="Hide"
Content="Hide"
Click="Hide_Click"
Width="150">
Width="200">
<ToolTipService.ToolTip>
<TextBlock Text="Hides the window from all UX representations in the system but keeps the object alive."
TextWrapping="Wrap" />
</ToolTipService.ToolTip>
</Button>

<Button x:Name="Show"
Click="Show_Click"
Width="200" >
<ToolTipService.ToolTip>
<TextBlock Text="Hides and then shows the window and activates it after 3 seconds."
TextWrapping="Wrap" />
</ToolTipService.ToolTip>
<TextBlock Text="Hide and show the window after 3 seconds" TextWrapping="WrapWholeWords" TextAlignment="Center"/>
</Button>
<Button x:Name="Close"
Click="Close_Click"
Width="150"
Width="200"
Margin="0,16,0,0">
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
<SymbolIcon Symbol="Cancel"
Expand Down
8 changes: 5 additions & 3 deletions WinUIGallery/Samples/SamplePages/SampleWindow1.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Threading.Tasks;
using Microsoft.UI;
using Microsoft.UI.Windowing;
using Microsoft.UI.Xaml;
Expand Down Expand Up @@ -49,13 +50,14 @@ private AppWindow GetAppWindowForCurrentWindow()
}

private void Show_Click(object sender, RoutedEventArgs e)
{
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
1 change: 1 addition & 0 deletions WinUIGallery/Samples/SamplePages/SampleWindow2.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public SampleWindow2()
{
this.InitializeComponent();
appWindow = GetAppWindowForCurrentWindow();
appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");

// Center the window on the screen.
CenterWindow(appWindow);
Expand Down
16 changes: 8 additions & 8 deletions WinUIGallery/Samples/SamplePages/SampleWindow3.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@
<Button x:Name="MaximizeBtn"
Content="Maximize"
Click="MaximizeBtn_Click"
Width="150" />
<Button x:Name="RestoreBtn"
Content="Restore"
Click="RestoreBtn_Click"
Width="150" />
Width="200" />
<Button x:Name="MinimizeBtn"
Content="Minimize"
Click="MinimizeBtn_Click"
Width="150" />

Width="200" />
<Button x:Name="RestoreBtn"
Click="RestoreBtn_Click"
Width="200" >
<TextBlock Text="Minimize and restore the window after 3 seconds" TextWrapping="WrapWholeWords" TextAlignment="Center"/>
</Button>
<Button x:Name="CloseBtn"
Click="CloseBtn_Click"
Width="150"
Width="200"
Margin="0,16,0,0">
<StackPanel Orientation="Horizontal"
VerticalAlignment="Center">
Expand Down
11 changes: 7 additions & 4 deletions WinUIGallery/Samples/SamplePages/SampleWindow3.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Threading.Tasks;
using Microsoft.UI;
using Microsoft.UI.Windowing;
using Microsoft.UI.Xaml;
Expand All @@ -21,7 +22,8 @@ public SampleWindow3(bool IsAlwaysOnTop, bool IsMaximizable, bool IsMinimizable,
presenter.IsMinimizable = IsMinimizable;
presenter.IsResizable = IsResizable;
presenter.SetBorderAndTitleBar(HasBorder,HasTitleBar);
appWindow.SetPresenter(presenter);
appWindow.SetPresenter(presenter);
appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
}

private AppWindow GetAppWindowForCurrentWindow()
Expand All @@ -38,12 +40,13 @@ private void MaximizeBtn_Click(object sender, RoutedEventArgs e)

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

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

private void CloseBtn_Click(object sender, RoutedEventArgs e)
Expand Down
15 changes: 8 additions & 7 deletions WinUIGallery/Samples/SamplePages/SampleWindow4.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,21 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"
Spacing="10">
<Button
x:Name="RestoreBtn"
Width="150"
Click="RestoreBtn_Click"
Content="Restore" />
<Button
x:Name="MinimizeBtn"
Width="150"
Width="200"
Click="MinimizeBtn_Click"
Content="Minimize" />

<Button x:Name="RestoreBtn"
Click="RestoreBtn_Click"
Width="200" >
<TextBlock Text="Minimize and restore the window after 3 seconds" TextWrapping="WrapWholeWords" TextAlignment="Center"/>
</Button>

<Button
x:Name="CloseBtn"
Width="150"
Width="200"
Margin="0,16,0,0"
Click="CloseBtn_Click">
<StackPanel VerticalAlignment="Center" Orientation="Horizontal">
Expand Down
5 changes: 4 additions & 1 deletion WinUIGallery/Samples/SamplePages/SampleWindow4.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Threading.Tasks;
using Microsoft.UI;
using Microsoft.UI.Windowing;
using Microsoft.UI.Xaml;
Expand All @@ -24,6 +25,7 @@ public SampleWindow4(int MinWidth, int MinHeight, int MaxWidth, int MaxHeight)
presenter.PreferredMaximumHeight = MaxHeight;
presenter.IsMaximizable = false;
appWindow.SetPresenter(presenter);
appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");
}

private AppWindow GetAppWindowForCurrentWindow()
Expand All @@ -40,7 +42,8 @@ private void MinimizeBtn_Click(object sender, RoutedEventArgs e)

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

private void CloseBtn_Click(object sender, RoutedEventArgs e)
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/Samples/SamplePages/SampleWindow6.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
TextAlignment="Center" />
<Button x:Name="Close"
Click="Close_Click"
Width="150"
Width="200"
HorizontalAlignment="Center">
<StackPanel Orientation="Horizontal"
VerticalAlignment="Center">
Expand Down
1 change: 1 addition & 0 deletions WinUIGallery/Samples/SamplePages/SampleWindow6.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public SampleWindow6()
{
this.InitializeComponent();
appWindow = GetAppWindowForCurrentWindow();
appWindow.SetIcon("Assets/Tiles/GalleryIcon.ico");

// Set the window to Full-Screen mode
appWindow.SetPresenter(AppWindowPresenterKind.FullScreen);
Expand Down
Loading