Cleanup TitleBar and prevent backward navigation according to lepoco#34

Author: pomianowski

WPFUI/Common/IRelayCommand.cs

@@ -1,4 +1,9 @@
-using System.Windows.Input;
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
+// All Rights Reserved.
+
+using System.Windows.Input;
 
 namespace WPFUI.Common
 {

WPFUI/Controls/Interfaces/INavigationItem.cs

@@ -1,4 +1,9 @@
-using System;
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+// Copyright (C) Leszek Pomianowski and WPF UI Contributors.
+// All Rights Reserved.
+
+using System;
 using System.ComponentModel;
 using System.Windows;
 

WPFUI/Controls/Navigation.cs

@@ -407,6 +407,10 @@ private void Frame_OnNavigating(object sender, NavigatingCancelEventArgs e)
             if (e.Content == null) return;
 
             Frame.NavigationService.RemoveBackEntry();
+
+            // TODO: Nothing is more permanent than temporary fixes... However, navigate using internal methods
+            if (e.NavigationMode == NavigationMode.Back)
+                e.Cancel = true;
         }
 
         #endregion

WPFUI/Controls/TitleBar.cs

@@ -315,16 +315,7 @@ public event RoutedEventHandler MinimizeClicked
         /// </summary>
         public Action<TitleBar, Window> MinimizeActionOverride { get; set; } = null;
 
-        private Window ParentWindow
-        {
-            get
-            {
-                if (_parent == null)
-                    _parent = Window.GetWindow(this);
-
-                return _parent;
-            }
-        }
+        private Window ParentWindow => _parent ??= Window.GetWindow(this);
 
         /// <summary>
         /// Creates a new instance of the class and sets the default <see cref="FrameworkElement.Loaded"/> event.
@@ -342,9 +333,7 @@ public TitleBar()
         public void ResetIcon()
         {
             if (_notifyIcon != null)
-            {
                 _notifyIcon.Destroy();
-            }
 
             InitializeNotifyIcon();
         }
@@ -366,10 +355,7 @@ private void CloseWindow()
 
         private void MinimizeWindow()
         {
-            if (MinimizeToTray && UseNotifyIcon && MinimizeWindowToTray())
-            {
-                return;
-            }
+            if (MinimizeToTray && UseNotifyIcon && MinimizeWindowToTray()) return;
 
             if (MinimizeActionOverride != null)
             {
@@ -404,10 +390,7 @@ private void MaximizeWindow()
 
         private void InitializeNotifyIcon()
         {
-            if (DesignerProperties.GetIsInDesignMode(new DependencyObject()))
-            {
-                return;
-            }
+            if (DesignerProperties.GetIsInDesignMode(new DependencyObject())) return;
 
             NotifyIconClick += OnNotifyIconClick;
 
@@ -427,9 +410,7 @@ private void InitializeNotifyIcon()
         private bool MinimizeWindowToTray()
         {
             if (_notifyIcon == null)
-            {
                 return false;
-            }
 
             ParentWindow.WindowState = WindowState.Minimized;
             ParentWindow.Hide();
@@ -439,15 +420,9 @@ private bool MinimizeWindowToTray()
 
         private void OnNotifyIconClick(object sender, RoutedEventArgs e)
         {
-            if (!MinimizeToTray)
-            {
-                return;
-            }
+            if (!MinimizeToTray) return;
 
-            if (ParentWindow.WindowState != WindowState.Minimized)
-            {
-                return;
-            }
+            if (ParentWindow.WindowState != WindowState.Minimized) return;
 
             ParentWindow.Show();
             ParentWindow.WindowState = WindowState.Normal;
@@ -460,10 +435,7 @@ private void OnNotifyIconClick(object sender, RoutedEventArgs e)
 
         private void InitializeSnapLayout(System.Windows.Controls.Button maximizeButton)
         {
-            if (!Common.SnapLayout.IsSupported())
-            {
-                return;
-            }
+            if (!Common.SnapLayout.IsSupported()) return;
 
             _snapLayout = new Common.SnapLayout();
             _snapLayout.Register(ParentWindow, maximizeButton);
@@ -472,18 +444,14 @@ private void InitializeSnapLayout(System.Windows.Controls.Button maximizeButton)
         private void TitleBar_Loaded(object sender, RoutedEventArgs e)
         {
             if (UseNotifyIcon)
-            {
                 InitializeNotifyIcon();
-            }
 
             // It may look ugly, but at the moment it works surprisingly well
 
             var maximizeButton = (System.Windows.Controls.Button)Template.FindName("ButtonMaximize", this);
 
             if (maximizeButton != null && UseSnapLayout)
-            {
                 InitializeSnapLayout(maximizeButton);
-            }
 
             var rootGrid = (System.Windows.Controls.Grid)Template.FindName("RootGrid", this);
 
@@ -494,20 +462,15 @@ private void TitleBar_Loaded(object sender, RoutedEventArgs e)
             }
 
             if (ParentWindow != null)
-            {
                 ParentWindow.StateChanged += ParentWindow_StateChanged;
-            }
         }
 
         private void ParentWindow_StateChanged(object sender, EventArgs e)
         {
-            if (ParentWindow != null)
-            {
-                if (IsMaximized != (ParentWindow.WindowState == WindowState.Maximized))
-                {
-                    IsMaximized = ParentWindow.WindowState == WindowState.Maximized;
-                }
-            }
+            if (ParentWindow == null) return;
+
+            if (IsMaximized != (ParentWindow.WindowState == WindowState.Maximized))
+                IsMaximized = ParentWindow.WindowState == WindowState.Maximized;
         }
 
         private void RootGrid_MouseDown(object sender, MouseButtonEventArgs e)
@@ -533,9 +496,7 @@ private void RootGrid_MouseDown(object sender, MouseButtonEventArgs e)
         private void RootGrid_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             if (e.ClickCount == 2)
-            {
                 MaximizeWindow();
-            }
         }
 
         private void TemplateButton_OnClick(TitleBar sender, object parameter)
@@ -565,10 +526,7 @@ private static void NotifyIconTooltip_OnChanged(DependencyObject d, DependencyPr
         {
             if (d is not TitleBar titleBar) return;
 
-            if (!titleBar.UseNotifyIcon)
-            {
-                return;
-            }
+            if (!titleBar.UseNotifyIcon) return;
 
             titleBar.ResetIcon();
         }
@@ -578,13 +536,9 @@ private static void UseNotifyIcon_OnChanged(DependencyObject d, DependencyProper
             if (d is not TitleBar titleBar) return;
 
             if (titleBar.UseNotifyIcon)
-            {
                 titleBar.ResetIcon();
-            }
             else
-            {
                 titleBar._notifyIcon.Destroy();
-            }
         }
 
         private static void NotifyIconMenu_OnChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)

WPFUI/Theme/Manager.cs

@@ -19,7 +19,7 @@ public static class Manager
     {
         private const string LibraryNamespace = "wpfui;";
 
-        private const string LibraryUri = "pack://application:,,,/WPFUI;component/Styles/Theme/";
+        private const string LibraryThemeDictionariesUri = "pack://application:,,,/WPFUI;component/Styles/Theme/";
 
         /// <summary>
         /// Determines whether the system is currently set to hight contrast mode.
@@ -73,7 +73,7 @@ public static void Switch(Style theme, bool useMica = false, bool updateAccent =
             if (updateAccent)
                 ChangeAccentColor(SystemTheme.GetColor(), theme, true);
 
-            bool isUpdated = appDictionaries.UpdateDictionary("theme", new Uri(LibraryUri + StyleFormat.GetInternalName(theme) + ".xaml", UriKind.Absolute));
+            bool isUpdated = appDictionaries.UpdateDictionary("theme", new Uri(LibraryThemeDictionariesUri + StyleFormat.GetInternalName(theme) + ".xaml", UriKind.Absolute));
 
             if (!isUpdated) return;