(selectedHeight);
- }
- }
-
- private void AddInteractiveElements_Click(object sender, RoutedEventArgs e)
- {
- var txtBoxNonClientArea = UIHelper.FindElementByName(sender as UIElement, "AppTitleBarTextBox") as FrameworkElement;
-
- if (txtBoxNonClientArea.Visibility == Visibility.Visible)
- {
- ResetTitlebarSettings();
- }
- else
- {
- addInteractiveElements.Content = "Remove interactive control from titlebar";
- txtBoxNonClientArea.Visibility = Visibility.Visible;
- if (sizeChangedEventHandlerAdded)
- {
- setTxtBoxAsPasthrough(txtBoxNonClientArea);
- }
- else
- {
- sizeChangedEventHandlerAdded = true;
- // run this code when textbox has been made visible and its actual width and height has been calculated
- txtBoxNonClientArea.SizeChanged += (object sender, SizeChangedEventArgs e) =>
- {
- if (txtBoxNonClientArea.Visibility != Visibility.Collapsed)
- {
- setTxtBoxAsPasthrough(txtBoxNonClientArea);
- }
- };
- }
-
- // announce visual change to automation
- UIHelper.AnnounceActionForAccessibility(sender as UIElement, "TitleBar size and width changed", "TitleBarChangedNotificationActivityId");
- }
- }
-
-}
+}
\ No newline at end of file
diff --git a/WinUIGallery/Samples/Data/ControlInfoData.json b/WinUIGallery/Samples/Data/ControlInfoData.json
index 657e32c8c..ac4f0fe11 100644
--- a/WinUIGallery/Samples/Data/ControlInfoData.json
+++ b/WinUIGallery/Samples/Data/ControlInfoData.json
@@ -3611,20 +3611,20 @@
{
"UniqueId": "TitleBar",
"Title": "TitleBar",
- "ApiNamespace": "Microsoft.UI.Xaml",
+ "ApiNamespace": "Microsoft.UI.Xaml.Controls",
"Subtitle": "An example showing a custom UIElement used as the titlebar for the app's window.",
"ImagePath": "ms-appx:///Assets/ControlImages/TitleBar.png",
- "Description": "This sample shows how to use a custom titlebar for the app's window. There are 2 ways of doing it: using default titlebar and setting an UIElement as a custom titlebar.",
+ "Description": "The TitleBar control provides a simple way to create a modern titlebar UX with interactive content.",
"Content": "Look at the TitleBarPage.xaml file in Visual Studio to see the full code for this page.
",
"IsUpdated": true,
"Docs": [
{
- "Title": "TitleBar - API",
- "Uri": "https://learn.microsoft.com/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.window.extendscontentintotitlebar"
+ "Title": "Title bar customization",
+ "Uri": "https://learn.microsoft.com/windows/apps/develop/title-bar"
},
{
- "Title": "Guidelines",
- "Uri": "https://learn.microsoft.com/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.window"
+ "Title": "Titl bar - design guidelines",
+ "Uri": "https://learn.microsoft.com/windows/apps/design/basics/titlebar-design"
}
],
"RelatedControls": [
diff --git a/WinUIGallery/Samples/SamplePages/ModalWindow.xaml.cs b/WinUIGallery/Samples/SamplePages/ModalWindow.xaml.cs
index ed7108ca4..f03b62439 100644
--- a/WinUIGallery/Samples/SamplePages/ModalWindow.xaml.cs
+++ b/WinUIGallery/Samples/SamplePages/ModalWindow.xaml.cs
@@ -23,7 +23,7 @@ public ModalWindow()
// Set this modal window's owner (the main application window).
// The main window can be retrieved from App.xaml.cs if it's set as a static property.
- SetOwnership(appWindow, App.StartupWindow);
+ SetOwnership(appWindow, App.MainWindow);
// Make the window modal (blocks interaction with the owner window until closed).
presenter.IsModal = true;
@@ -76,7 +76,7 @@ private void SetOwnership(AppWindow ownedAppWindow, Window ownerWindow)
private void ModalWindow_Closed(object sender, WindowEventArgs args)
{
// Reactivate the main application window when the modal window closes.
- App.StartupWindow.Activate();
+ App.MainWindow.Activate();
}
private void OKButton_Click(object sender, RoutedEventArgs e)
diff --git a/WinUIGallery/Samples/SamplePages/TitleBarWindow.xaml b/WinUIGallery/Samples/SamplePages/TitleBarWindow.xaml
new file mode 100644
index 000000000..f74798b71
--- /dev/null
+++ b/WinUIGallery/Samples/SamplePages/TitleBarWindow.xaml
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WinUIGallery/Samples/SamplePages/TitleBarWindow.xaml.cs b/WinUIGallery/Samples/SamplePages/TitleBarWindow.xaml.cs
new file mode 100644
index 000000000..b89bebd06
--- /dev/null
+++ b/WinUIGallery/Samples/SamplePages/TitleBarWindow.xaml.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Linq;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace WinUIGallery.Samples.SamplePages;
+
+public sealed partial class TitleBarWindow : Window
+{
+ public TitleBarWindow()
+ {
+ this.InitializeComponent();
+ this.ExtendsContentIntoTitleBar = true; // Extend the content into the title bar and hide the default title bar
+ this.AppWindow.TitleBar.PreferredHeightOption = Microsoft.UI.Windowing.TitleBarHeightOption.Tall;
+ this.SetTitleBar(titleBar); // Set the custom title bar
+ navView.SelectedItem = navView.MenuItems.OfType().First();
+ }
+
+ private void TitleBar_PaneToggleRequested(TitleBar sender, object args)
+ {
+ navView.IsPaneOpen = !navView.IsPaneOpen;
+ }
+
+ private void TitleBar_BackRequested(TitleBar sender, object args)
+ {
+ navFrame.GoBack();
+ }
+
+ private void navView_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
+ {
+ var selectedItem = (NavigationViewItem)args.SelectedItem;
+ if (selectedItem != null)
+ {
+ string selectedItemTag = ((string)selectedItem.Tag);
+ sender.Header = "Sample Page " + selectedItemTag.Substring(selectedItemTag.Length - 1);
+ string pageName = "WinUIGallery.SamplePages." + selectedItemTag;
+ Type pageType = Type.GetType(pageName);
+ navFrame.Navigate(pageType);
+ }
+ }
+}
diff --git a/WinUIGallery/Styles/TitleBar.xaml b/WinUIGallery/Styles/TitleBar.xaml
new file mode 100644
index 000000000..0d384f34d
--- /dev/null
+++ b/WinUIGallery/Styles/TitleBar.xaml
@@ -0,0 +1,286 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WinUIGallery/WinUIGallery.csproj b/WinUIGallery/WinUIGallery.csproj
index 1e87d50d0..45a93dc28 100644
--- a/WinUIGallery/WinUIGallery.csproj
+++ b/WinUIGallery/WinUIGallery.csproj
@@ -307,6 +307,7 @@
+
@@ -314,11 +315,15 @@
+
+
+
+
@@ -505,6 +510,18 @@
+
+
+ MSBuild:Compile
+
+
+
+
+
+ MSBuild:Compile
+
+
+
MSBuild:Compile
@@ -555,6 +572,12 @@
MSBuild:Compile
+
+
+
+ MSBuild:Compile
+
+
MSBuild:Compile
diff --git a/standalone.props b/standalone.props
index 468ca5a54..78226a094 100644
--- a/standalone.props
+++ b/standalone.props
@@ -17,8 +17,8 @@
However, because we overwrite those to output to subdirectories, the outputs of the UWP WinUI Gallery
are erroneously included. Explicitly exclude them here
-->
- obj\**;bin\**;$(DefaultItemExcludes)
-
- obj\generated
-
+ obj\**;bin\**;$(DefaultItemExcludes)
+
+ obj\generated
+
\ No newline at end of file