"What's new" improvements

Directory.Packages.props

@@ -26,7 +26,7 @@
     <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.2.250402" />
     <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250402" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
-    <PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.251002-build.2316" />
+    <PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.260107-build.2454" />
     <PackageVersion Include="ControlzEx" Version="6.0.0" />
     <PackageVersion Include="HelixToolkit" Version="2.24.0" />
     <PackageVersion Include="HelixToolkit.Core.Wpf" Version="2.24.0" />

src/settings-ui/Settings.UI/OOBE/Enums/PowerToysModules.cs

@@ -32,7 +32,6 @@ public enum PowerToysModules
         MeasureTool,
         Hosts,
         Workspaces,
-        WhatsNew,
         RegistryPreview,
         NewPlus,
         ZoomIt,

src/settings-ui/Settings.UI/SettingsXAML/App.xaml.cs

@@ -9,7 +9,6 @@
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
-
 using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library;
@@ -227,7 +226,6 @@ private void OnLaunchedFromRunner(string[] cmdArgs)
             {
                 settingsWindow = new MainWindow();
                 settingsWindow.Activate();
-                settingsWindow.ExtendsContentIntoTitleBar = true;
                 settingsWindow.NavigateToSection(StartupPage);
 
                 // https://github.com/microsoft/microsoft-ui-xaml/issues/7595 - Activate doesn't bring window to the foreground
@@ -257,11 +255,10 @@ private void OnLaunchedFromRunner(string[] cmdArgs)
                 else if (ShowScoobe)
                 {
                     PowerToysTelemetry.Log.WriteEvent(new ScoobeStartedEvent());
-                    OobeWindow scoobeWindow = new OobeWindow(OOBE.Enums.PowerToysModules.WhatsNew);
-                    scoobeWindow.Activate();
-                    scoobeWindow.ExtendsContentIntoTitleBar = true;
+                    ScoobeWindow newScoobeWindow = new ScoobeWindow();
+                    newScoobeWindow.Activate();
                     WindowHelpers.ForceTopBorder1PixelInsetOnWindows10(WindowNative.GetWindowHandle(settingsWindow));
-                    SetOobeWindow(scoobeWindow);
+                    SetScoobeWindow(newScoobeWindow);
                 }
             }
         }
@@ -339,6 +336,7 @@ public static int UpdateUIThemeMethod(string themeName)
 
         private static MainWindow settingsWindow;
         private static OobeWindow oobeWindow;
+        private static ScoobeWindow scoobeWindow;
 
         public static void ClearSettingsWindow()
         {
@@ -365,6 +363,21 @@ public static void ClearOobeWindow()
             oobeWindow = null;
         }
 
+        public static ScoobeWindow GetScoobeWindow()
+        {
+            return scoobeWindow;
+        }
+
+        public static void SetScoobeWindow(ScoobeWindow window)
+        {
+            scoobeWindow = window;
+        }
+
+        public static void ClearScoobeWindow()
+        {
+            scoobeWindow = null;
+        }
+
         public static Type GetPage(string settingWindow)
         {
             switch (settingWindow)

src/settings-ui/Settings.UI/SettingsXAML/MainWindow.xaml.cs

@@ -20,9 +20,6 @@
 
 namespace Microsoft.PowerToys.Settings.UI
 {
-    /// <summary>
-    /// An empty window that can be used on its own or navigated to within a Frame.
-    /// </summary>
     public sealed partial class MainWindow : WindowEx
     {
         public MainWindow(bool createHidden = false)
@@ -35,10 +32,12 @@ public MainWindow(bool createHidden = false)
             App.ThemeService.ThemeChanged += OnThemeChanged;
             App.ThemeService.ApplyTheme();
 
+            this.ExtendsContentIntoTitleBar = true;
+
             ShellPage.SetElevationStatus(App.IsElevated);
             ShellPage.SetIsUserAnAdmin(App.IsUserAnAdmin);
 
-            var hWnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
+            var hWnd = WindowNative.GetWindowHandle(this);
             var placement = WindowHelper.DeserializePlacementOrDefault(hWnd);
             if (createHidden)
             {
@@ -121,16 +120,12 @@ public MainWindow(bool createHidden = false)
             // open whats new window
             ShellPage.SetOpenWhatIsNewCallback(() =>
             {
-                if (App.GetOobeWindow() == null)
+                if (App.GetScoobeWindow() == null)
                 {
-                    App.SetOobeWindow(new OobeWindow(OOBE.Enums.PowerToysModules.WhatsNew));
-                }
-                else
-                {
-                    App.GetOobeWindow().SetAppWindow(OOBE.Enums.PowerToysModules.WhatsNew);
+                    App.SetScoobeWindow(new ScoobeWindow());
                 }
 
-                App.GetOobeWindow().Activate();
+                App.GetScoobeWindow().Activate();
             });
 
             this.InitializeComponent();
@@ -187,7 +182,7 @@ private void Window_Closed(object sender, WindowEventArgs args)
             var hWnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
             WindowHelper.SerializePlacement(hWnd);
 
-            if (App.GetOobeWindow() == null)
+            if (App.GetOobeWindow() == null && App.GetScoobeWindow() == null)
             {
                 App.ClearSettingsWindow();
             }

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml

@@ -1,60 +1,44 @@
-<UserControl
+<Page
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeShellPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:animations="using:CommunityToolkit.WinUI.Animations"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
     HighContrastAdjustment="None"
     Loaded="ShellPage_Loaded"
     mc:Ignorable="d">
-
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
+            <RowDefinition Height="48" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <Button
-            x:Name="PaneToggleBtn"
-            Width="48"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            Click="PaneToggleBtn_Click"
-            Style="{StaticResource PaneToggleButtonStyle}" />
-        <Grid
+        <TitleBar
             x:Name="AppTitleBar"
-            Height="48"
-            Margin="48,0,0,0"
-            VerticalAlignment="Center"
-            IsHitTestVisible="True">
-            <animations:Implicit.Animations>
-                <animations:OffsetAnimation Duration="0:0:0.3" />
-            </animations:Implicit.Animations>
-            <StackPanel Orientation="Horizontal">
-                <Image
-                    Width="16"
+            x:Uid="OobeWindow_TitleTxt"
+            IsBackButtonVisible="False"
+            IsPaneToggleButtonVisible="False"
+            PaneToggleRequested="TitleBar_PaneButtonClick">
+            <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
+            <TitleBar.LeftHeader>
+                <ImageIcon
+                    x:Name="TitleBarIcon"
                     Height="16"
+                    Margin="16,0,0,0"
                     Source="/Assets/Settings/icon.ico" />
-                <TextBlock
-                    x:Name="AppTitleBarText"
-                    x:Uid="OobeWindow_TitleTxt"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource CaptionTextBlockStyle}"
-                    TextWrapping="NoWrap" />
-            </StackPanel>
-        </Grid>
-
+            </TitleBar.LeftHeader>
+        </TitleBar>
         <NavigationView
             x:Name="navigationView"
             Grid.Row="1"
+            CompactModeThresholdWidth="1007"
             DisplayModeChanged="NavigationView_DisplayModeChanged"
+            ExpandedModeThresholdWidth="1007"
             IsBackButtonVisible="Collapsed"
             IsPaneOpen="True"
             IsPaneToggleButtonVisible="False"
             IsSettingsVisible="False"
             OpenPaneLength="296"
-            PaneDisplayMode="Left"
             SelectionChanged="NavigationView_SelectionChanged">
             <NavigationView.MenuItems>
                 <NavigationViewItem
@@ -174,34 +158,16 @@
                     Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ZoomIt.png}"
                     Tag="ZoomIt" />
             </NavigationView.MenuItems>
-            <NavigationView.FooterMenuItems>
+            <NavigationView.PaneFooter>
                 <NavigationViewItem
                     x:Uid="Shell_WhatsNew"
+                    AutomationProperties.AutomationId="WhatIsNewNavItem"
                     Icon="{ui:FontIcon Glyph=&#xE789;}"
-                    Tag="WhatsNew" />
-            </NavigationView.FooterMenuItems>
+                    Tapped="WhatIsNewItem_Tapped" />
+            </NavigationView.PaneFooter>
             <NavigationView.Content>
                 <Frame x:Name="NavigationFrame" />
             </NavigationView.Content>
         </NavigationView>
-
-        <VisualStateManager.VisualStateGroups>
-            <VisualStateGroup x:Name="LayoutVisualStates">
-                <VisualState x:Name="WideLayout">
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="720" />
-                    </VisualState.StateTriggers>
-                </VisualState>
-                <VisualState x:Name="SmallLayout">
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="600" />
-                        <AdaptiveTrigger MinWindowWidth="0" />
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <Setter Target="navigationView.PaneDisplayMode" Value="LeftMinimal" />
-                    </VisualState.Setters>
-                </VisualState>
-            </VisualStateGroup>
-        </VisualStateManager.VisualStateGroups>
     </Grid>
-</UserControl>
+</Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml.cs

@@ -5,18 +5,17 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Globalization;
-
 using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.OOBE.Enums;
 using Microsoft.PowerToys.Settings.UI.OOBE.ViewModel;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using WinRT.Interop;
+using Microsoft.UI.Xaml.Input;
 
 namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
 {
-    public sealed partial class OobeShellPage : UserControl
+    public sealed partial class OobeShellPage : Page
     {
         public static Func<string> RunSharedEventCallback { get; set; }
 
@@ -63,7 +62,6 @@ public OobeShellPage()
 
             // NOTE: Experimentation for OOBE is currently turned off on server side. Keeping this code in a comment to allow future experiments.
             // ExperimentationToggleSwitchEnabled = SettingsRepository<GeneralSettings>.GetInstance(settingsUtils).SettingsConfig.EnableExperimentation;
-            SetTitleBar();
             DataContext = ViewModel;
             OobeShellHandler = this;
             Modules = new ObservableCollection<OobePowerToysModule>();
@@ -202,12 +200,6 @@ public OobeShellPage()
                 IsNew = true,
             });
 
-            Modules.Insert((int)PowerToysModules.WhatsNew, new OobePowerToysModule()
-            {
-                ModuleName = "WhatsNew",
-                IsNew = false,
-            });
-
             Modules.Insert((int)PowerToysModules.RegistryPreview, new OobePowerToysModule()
             {
                 ModuleName = "RegistryPreview",
@@ -229,7 +221,7 @@ public OobeShellPage()
 
         public void OnClosing()
         {
-            Microsoft.UI.Xaml.Controls.NavigationViewItem selectedItem = this.navigationView.SelectedItem as Microsoft.UI.Xaml.Controls.NavigationViewItem;
+            NavigationViewItem selectedItem = this.navigationView.SelectedItem as NavigationViewItem;
             if (selectedItem != null)
             {
                 Modules[(int)(PowerToysModules)Enum.Parse(typeof(PowerToysModules), (string)selectedItem.Tag, true)].LogClosingModuleEvent();
@@ -238,19 +230,22 @@ public void OnClosing()
 
         public void NavigateToModule(PowerToysModules selectedModule)
         {
-            if (selectedModule == PowerToysModules.WhatsNew)
-            {
-                navigationView.SelectedItem = navigationView.FooterMenuItems[0];
-            }
-            else
+            navigationView.SelectedItem = navigationView.MenuItems[(int)selectedModule];
+        }
+
+        private static void OpenScoobeWindow()
+        {
+            if (App.GetScoobeWindow() == null)
             {
-                navigationView.SelectedItem = navigationView.MenuItems[(int)selectedModule];
+                App.SetScoobeWindow(new ScoobeWindow());
             }
+
+            App.GetScoobeWindow().Activate();
         }
 
-        private void NavigationView_SelectionChanged(Microsoft.UI.Xaml.Controls.NavigationView sender, Microsoft.UI.Xaml.Controls.NavigationViewSelectionChangedEventArgs args)
+        private void NavigationView_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
         {
-            Microsoft.UI.Xaml.Controls.NavigationViewItem selectedItem = args.SelectedItem as Microsoft.UI.Xaml.Controls.NavigationViewItem;
+            NavigationViewItem selectedItem = args.SelectedItem as NavigationViewItem;
 
             if (selectedItem != null)
             {
@@ -278,7 +273,7 @@ private void NavigationView_SelectionChanged(Microsoft.UI.Xaml.Controls.Navigati
                             break;
                         }
                     */
-                    case "WhatsNew": NavigationFrame.Navigate(typeof(OobeWhatsNew)); break;
+
                     case "AdvancedPaste": NavigationFrame.Navigate(typeof(OobeAdvancedPaste)); break;
                     case "AlwaysOnTop": NavigationFrame.Navigate(typeof(OobeAlwaysOnTop)); break;
                     case "Awake": NavigationFrame.Navigate(typeof(OobeAwake)); break;
@@ -311,43 +306,37 @@ private void NavigationView_SelectionChanged(Microsoft.UI.Xaml.Controls.Navigati
             }
         }
 
-        private void SetTitleBar()
-        {
-            var u = App.GetOobeWindow();
-            if (u != null)
-            {
-                // A custom title bar is required for full window theme and Mica support.
-                // https://docs.microsoft.com/windows/apps/develop/title-bar?tabs=winui3#full-customization
-                u.ExtendsContentIntoTitleBar = true;
-                WindowHelpers.ForceTopBorder1PixelInsetOnWindows10(WindowNative.GetWindowHandle(u));
-                u.SetTitleBar(AppTitleBar);
-            }
-        }
-
         private void ShellPage_Loaded(object sender, RoutedEventArgs e)
         {
-            SetTitleBar();
+            // Select the first module by default
+            if (navigationView.MenuItems.Count > 0)
+            {
+                navigationView.SelectedItem = navigationView.MenuItems[0];
+            }
         }
 
         private void NavigationView_DisplayModeChanged(NavigationView sender, NavigationViewDisplayModeChangedEventArgs args)
         {
             if (args.DisplayMode == NavigationViewDisplayMode.Compact || args.DisplayMode == NavigationViewDisplayMode.Minimal)
             {
-                PaneToggleBtn.Visibility = Visibility.Visible;
-                AppTitleBar.Margin = new Thickness(48, 0, 0, 0);
-                AppTitleBarText.Margin = new Thickness(12, 0, 0, 0);
+                TitleBarIcon.Margin = new Thickness(0, 0, 8, 0); // Workaround, see XAML comment
+                AppTitleBar.IsPaneToggleButtonVisible = true;
             }
             else
             {
-                PaneToggleBtn.Visibility = Visibility.Collapsed;
-                AppTitleBar.Margin = new Thickness(16, 0, 0, 0);
-                AppTitleBarText.Margin = new Thickness(16, 0, 0, 0);
+                TitleBarIcon.Margin = new Thickness(16, 0, 0, 0);  // Workaround, see XAML comment
+                AppTitleBar.IsPaneToggleButtonVisible = false;
             }
         }
 
-        private void PaneToggleBtn_Click(object sender, RoutedEventArgs e)
+        private void TitleBar_PaneButtonClick(TitleBar sender, object args)
         {
             navigationView.IsPaneOpen = !navigationView.IsPaneOpen;
         }
+
+        private void WhatIsNewItem_Tapped(object sender, TappedRoutedEventArgs e)
+        {
+            OpenScoobeWindow();
+        }
     }
 }