From c69afe69dd334403760cf9bf34b4727a183b91ba Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Mon, 2 Oct 2023 01:00:31 -0400
Subject: [PATCH] Try out more UI functionality

---
 CHANGELIST.md                                             | 1 +
 .../WPFCustomMessageBox/CustomMessageBoxWindow.xaml       | 1 -
 .../WPFCustomMessageBox/CustomMessageBoxWindow.xaml.cs    | 4 +++-
 MPF.UI.Core/ViewModels/MainViewModel.cs                   | 8 ++++++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELIST.md b/CHANGELIST.md
index a041516f..3b84c112 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -14,6 +14,7 @@
 - Fix redumper EDC detection output
 - Fix XGD4 PIC reading
 - Ensure popups are topmost
+- Try out more UI functionality
 
 ### 2.6.5 (2023-09-27)
 
diff --git a/MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml b/MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml
index 0d251be8..85284c3f 100644
--- a/MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml
+++ b/MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml
@@ -4,7 +4,6 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         WindowStartupLocation="CenterScreen"
         WindowStyle="None"
-        ShowInTaskbar="False"
         ResizeMode="NoResize" SizeToContent="WidthAndHeight"
         TextOptions.TextFormattingMode="Display" TextOptions.TextRenderingMode="ClearType" UseLayoutRounding="True"
         Title="" MinHeight="155" MaxWidth="470" MinWidth="154"
diff --git a/MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml.cs b/MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml.cs
index 6aecb183..5630d47f 100644
--- a/MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml.cs
+++ b/MPF.UI.Core/External/WPFCustomMessageBox/CustomMessageBoxWindow.xaml.cs
@@ -91,7 +91,9 @@ namespace WPFCustomMessageBox
             InitializeComponent();
 
             _removeTitleBarIcon = removeTitleBarIcon;
-            Topmost = true;
+            Focusable = true;
+            ShowActivated = true;
+            ShowInTaskbar = true;
 
             if (owner != null)
             {
diff --git a/MPF.UI.Core/ViewModels/MainViewModel.cs b/MPF.UI.Core/ViewModels/MainViewModel.cs
index b65beebd..97f69a6b 100644
--- a/MPF.UI.Core/ViewModels/MainViewModel.cs
+++ b/MPF.UI.Core/ViewModels/MainViewModel.cs
@@ -507,8 +507,10 @@ namespace MPF.UI.Core.ViewModels
         {
             var optionsWindow = new OptionsWindow(this.Options)
             {
+                Focusable = true,
                 Owner = this.Parent,
-                Topmost = true,
+                ShowActivated = true,
+                ShowInTaskbar = true,
                 WindowStartupLocation = WindowStartupLocation.CenterOwner,
             };
             optionsWindow.Closed += OnOptionsUpdated;
@@ -1251,8 +1253,10 @@ namespace MPF.UI.Core.ViewModels
 
             var discInformationWindow = new DiscInformationWindow(this.Options, submissionInfo)
             {
+                Focusable = true,
                 Owner = this.Parent,
-                Topmost = true,
+                ShowActivated = true,
+                ShowInTaskbar = true,
                 WindowStartupLocation = WindowStartupLocation.CenterOwner,
             };
             bool? result = discInformationWindow.ShowDialog();