From 025246d6fa97bc14a1a56724993c93afd5c7c208 Mon Sep 17 00:00:00 2001
From: hawkeye <hawkeyesk@outlook.com>
Date: Thu, 29 Feb 2024 01:11:56 -0500
Subject: [PATCH] Version 4.1.0 beta

---
 DomainModel/DomainModel.csproj                |  6 +-
 DomainModel/Profile/FloatingPanel.cs          | 11 +++
 DomainModel/Profile/PanelConfig.cs            | 13 ++-
 DomainModel/Profile/PanelConfigItem.cs        |  2 +
 DomainModel/Profile/UserProfile.cs            | 15 ++++
 MainApp/App.xaml.cs                           |  2 +-
 .../AppUserControl/PopOutPanelConfigCard.xaml | 43 ++++++---
 .../PopOutPanelConfigCard.xaml.cs             | 81 +++++++++++++++--
 MainApp/MainApp.csproj                        |  6 +-
 .../PopOutPanelConfigCardViewModel.cs         |  4 +-
 Orchestration/AppOrchestrator.cs              |  2 +-
 Orchestration/KeyboardOrchestrator.cs         | 90 ++++++++++++++++---
 Orchestration/Orchestration.csproj            |  6 +-
 .../PanelConfigurationOrchestrator.cs         | 29 ++++++
 RELEASENOTES.md                               |  6 +-
 Shared/QualifyFullName.cs                     | 14 +++
 Shared/Shared.csproj                          |  6 +-
 SimconnectAgent/SimconnectAgent.csproj        |  6 +-
 VERSION.md                                    | 10 ++-
 WindowsAgent/InputHookManager.cs              | 37 ++++++--
 WindowsAgent/WindowActionManager.cs           |  5 ++
 WindowsAgent/WindowEventManager.cs            |  6 ++
 WindowsAgent/WindowsAgent.csproj              |  6 +-
 23 files changed, 339 insertions(+), 67 deletions(-)
 create mode 100644 DomainModel/Profile/FloatingPanel.cs
 create mode 100644 Shared/QualifyFullName.cs

diff --git a/DomainModel/DomainModel.csproj b/DomainModel/DomainModel.csproj
index 4bc947a..c03a46f 100644
--- a/DomainModel/DomainModel.csproj
+++ b/DomainModel/DomainModel.csproj
@@ -11,9 +11,9 @@
 		<PackageProjectUrl>https://github.com/hawkeye-stan/msfs-popout-panel-manager</PackageProjectUrl>
 		<RootNamespace>MSFSPopoutPanelManager.DomainModel</RootNamespace>
 		<Platforms>x64</Platforms>
-		<Version>4.1.0.1</Version>
-		<AssemblyVersion>4.1.0.1</AssemblyVersion>
-		<FileVersion>4.1.0.1</FileVersion>
+		<Version>4.1.0.2</Version>
+		<AssemblyVersion>4.1.0.2</AssemblyVersion>
+		<FileVersion>4.1.0.2</FileVersion>
 		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
 		<DebugType>Embedded</DebugType>
 		<Configurations>Debug;Release;Local</Configurations>
diff --git a/DomainModel/Profile/FloatingPanel.cs b/DomainModel/Profile/FloatingPanel.cs
new file mode 100644
index 0000000..e0e04e0
--- /dev/null
+++ b/DomainModel/Profile/FloatingPanel.cs
@@ -0,0 +1,11 @@
+using MSFSPopoutPanelManager.Shared;
+
+namespace MSFSPopoutPanelManager.DomainModel.Profile
+{
+    public class FloatingPanel : ObservableObject
+    {
+        public bool IsEnabled { get; set; }
+
+        public string KeyBinding { get; set; }
+    }
+}
diff --git a/DomainModel/Profile/PanelConfig.cs b/DomainModel/Profile/PanelConfig.cs
index 878f2a0..7e0c33e 100644
--- a/DomainModel/Profile/PanelConfig.cs
+++ b/DomainModel/Profile/PanelConfig.cs
@@ -18,15 +18,20 @@ namespace MSFSPopoutPanelManager.DomainModel.Profile
 
         private void PanelConfig_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
-            if (e.PropertyName == "FullScreen" && FullScreen)
+            if (e.PropertyName == nameof(FullScreen) && FullScreen)
             {
                 AlwaysOnTop = false;
                 HideTitlebar = false;
             }
-            else if (e.PropertyName == "TouchEnabled" && TouchEnabled)
+            else if (e.PropertyName == nameof(TouchEnabled) && TouchEnabled)
             {
                 AutoGameRefocus = true;
             }
+            else if (e.PropertyName == nameof(FloatingPanel))
+            {
+                if(!FloatingPanel.IsEnabled)
+                    FloatingPanel.KeyBinding = null;
+            }
         }
 
         public Guid Id { get; set; }
@@ -53,6 +58,8 @@ namespace MSFSPopoutPanelManager.DomainModel.Profile
 
         public bool AutoGameRefocus { get; set; } = true;
 
+        public FloatingPanel FloatingPanel { get; set; } = new();
+
         public PanelSource PanelSource { get; set; } = new();
 
         public FixedCameraConfig FixedCameraConfig { get; set; } = new();
@@ -85,6 +92,8 @@ namespace MSFSPopoutPanelManager.DomainModel.Profile
         [JsonIgnore]
         public bool IsShownPanelSource { get; set; }
 
+        [JsonIgnore] public bool IsFloating { get; set; } = true;
+
         [JsonIgnore]
         public bool IsDeletablePanel => PanelType != PanelType.HudBarWindow && PanelType != PanelType.RefocusDisplay &&
                                         PanelType != PanelType.NumPadWindow;
diff --git a/DomainModel/Profile/PanelConfigItem.cs b/DomainModel/Profile/PanelConfigItem.cs
index 15697ca..6f5bd56 100644
--- a/DomainModel/Profile/PanelConfigItem.cs
+++ b/DomainModel/Profile/PanelConfigItem.cs
@@ -21,6 +21,8 @@ namespace MSFSPopoutPanelManager.DomainModel.Profile
         FullScreen,
         TouchEnabled,
         AutoGameRefocus,
+        AllowFloatPanel,
+        FloatPanelKeyBinding,
         None
     }
 }
diff --git a/DomainModel/Profile/UserProfile.cs b/DomainModel/Profile/UserProfile.cs
index 7657661..8ae1c27 100644
--- a/DomainModel/Profile/UserProfile.cs
+++ b/DomainModel/Profile/UserProfile.cs
@@ -34,6 +34,20 @@ namespace MSFSPopoutPanelManager.DomainModel.Profile
                             if (arg is PropertyChangedExtendedEventArgs { DisableSave: false })
                                 OnProfileChanged?.Invoke(this, EventArgs.Empty);
 
+                            if (arg is PropertyChangedExtendedEventArgs changedArg)
+                            {
+                                if (changedArg.ObjectName == QualifyFullName.Of(nameof(MSFSPopoutPanelManager.DomainModel.Profile.FloatingPanel)) &&
+                                    changedArg.PropertyName == nameof(FloatingPanel.IsEnabled))
+                                {
+                                    if(PanelConfigs.Any(x => x.FloatingPanel.IsEnabled))
+                                        OnUseFloatingPanelChanged?.Invoke(this, true);
+                                    else
+                                        OnUseFloatingPanelChanged?.Invoke(this, false);
+                                }
+                            }
+
+
+
                             OnPanelConfigChanged();
                         };
                         OnProfileChanged?.Invoke(this, EventArgs.Empty);
@@ -51,6 +65,7 @@ namespace MSFSPopoutPanelManager.DomainModel.Profile
             InitializeChildPropertyChangeBinding();
         }
 
+        public event EventHandler<bool> OnUseFloatingPanelChanged;
         public event EventHandler OnProfileChanged;
 
         public Guid Id { get; set; } = Guid.NewGuid();
diff --git a/MainApp/App.xaml.cs b/MainApp/App.xaml.cs
index 33832cc..1c8c945 100644
--- a/MainApp/App.xaml.cs
+++ b/MainApp/App.xaml.cs
@@ -57,7 +57,7 @@ namespace MSFSPopoutPanelManager.MainApp
                         services.AddSingleton(s => new PanelPopOutOrchestrator(SharedStorage, s.GetRequiredService<FlightSimOrchestrator>(), s.GetRequiredService<PanelSourceOrchestrator>(), s.GetRequiredService<PanelConfigurationOrchestrator>()));
                         services.AddSingleton(s => new PanelConfigurationOrchestrator(SharedStorage, s.GetRequiredService<FlightSimOrchestrator>()));
                         services.AddSingleton(s => new FlightSimOrchestrator(SharedStorage));
-                        services.AddSingleton(s => new KeyboardOrchestrator(SharedStorage, s.GetRequiredService<PanelPopOutOrchestrator>()));
+                        services.AddSingleton(s => new KeyboardOrchestrator(SharedStorage, s.GetRequiredService<PanelPopOutOrchestrator>(), s.GetRequiredService<PanelConfigurationOrchestrator>()));
                         services.AddSingleton(s => new HelpOrchestrator());
 
                         services.AddSingleton(s => new OrchestratorUiHelper(SharedStorage, s.GetRequiredService<PanelSourceOrchestrator>(), s.GetRequiredService<PanelPopOutOrchestrator>()));
diff --git a/MainApp/AppUserControl/PopOutPanelConfigCard.xaml b/MainApp/AppUserControl/PopOutPanelConfigCard.xaml
index 2249aab..46720a3 100644
--- a/MainApp/AppUserControl/PopOutPanelConfigCard.xaml
+++ b/MainApp/AppUserControl/PopOutPanelConfigCard.xaml
@@ -52,9 +52,9 @@
             x:Key="TextBlockLabel"
             BasedOn="{StaticResource {x:Type TextBlock}}"
             TargetType="TextBlock">
-            <Setter Property="FontSize" Value="14" />
+            <Setter Property="FontSize" Value="13" />
             <Setter Property="TextWrapping" Value="Wrap" />
-            <Setter Property="Margin" Value="5,0,40,0" />
+            <Setter Property="Margin" Value="5,0,13,0" />
             <Setter Property="LineHeight" Value="18" />
         </Style>
         <Style BasedOn="{StaticResource MaterialDesignIconForegroundButton}" TargetType="Button" />
@@ -284,9 +284,9 @@
             </Expander.Header>
             <StackPanel
                 Margin="42,8,24,16"
-                Orientation="Horizontal"
+                Orientation="Vertical"
                 TextBlock.Foreground="{DynamicResource MaterialDesignBody}">
-                <WrapPanel>
+                <WrapPanel Orientation="Horizontal">
                     <ToggleButton
                         x:Name="TglBtnAlwaysOnTop"
                         Margin="0,0,0,0"
@@ -297,9 +297,6 @@
                     <TextBlock Style="{StaticResource TxtBlockDisableWhenFullScreen}" ToolTip="Set this panel to be always on top">
                         Always on Top
                     </TextBlock>
-                </WrapPanel>
-
-                <WrapPanel>
                     <ToggleButton
                         x:Name="TglBtnFullScreen"
                         Margin="0,0,0,0"
@@ -307,9 +304,6 @@
                         SourceUpdated="Data_SourceUpdated"
                         Style="{StaticResource ToggleButton}" />
                     <TextBlock Style="{StaticResource TextBlockLabel}" ToolTip="Expand this panel into full screen (emulate keystroke Alt-Enter)">Full Screen Mode</TextBlock>
-                </WrapPanel>
-
-                <WrapPanel>
                     <ToggleButton
                         x:Name="TglBtnHideTitlebar"
                         Margin="0,0,0,0"
@@ -320,16 +314,37 @@
                     <TextBlock Style="{StaticResource TxtBlockDisableWhenFullScreen}" ToolTip="Hide the title bar for this panel">
                         Hide Title Bar
                     </TextBlock>
-                </WrapPanel>
-
-                <WrapPanel>
                     <ToggleButton
                         x:Name="TglBtnAutoGameRefocus"
                         Margin="0,0,0,0"
                         IsChecked="{Binding DataItem.AutoGameRefocus, Mode=TwoWay, NotifyOnSourceUpdated=True}"
                         SourceUpdated="Data_SourceUpdated"
                         Style="{StaticResource ToggleButton}" />
-                    <TextBlock Style="{StaticResource TextBlockLabel}" ToolTip="Automatic game refocus when clicking this panel or when using touch on this panel">Automatic Game Refocus</TextBlock>
+                    <TextBlock Style="{StaticResource TextBlockLabel}" ToolTip="Automatic game refocus when clicking this panel or when using touch on this panel">Auto Game Refocus</TextBlock>
+
+                    <ToggleButton
+                        x:Name="TglBtnAllowFloatPanel"
+                        Margin="0"
+                        IsChecked="{Binding DataItem.FloatingPanel.IsEnabled, Mode=TwoWay, NotifyOnSourceUpdated=True}"
+                        SourceUpdated="Data_SourceUpdated"
+                        Style="{StaticResource ToggleButton}" />
+                    <TextBlock
+                        Margin="5,0,10,0"
+                        Style="{StaticResource TextBlockLabel}"
+                        ToolTip="Set the pop out panel that can float above other windows">
+                        Floating Window
+                    </TextBlock>
+                    <ComboBox
+                        x:Name="ComboBoxFloatPanelKeyBinding"
+                        Width="60"
+                        Margin="0"
+                        Padding="0"
+                        VerticalAlignment="top"
+                        Loaded="ComboBoxFloatPanelKeyBinding_OnLoaded"
+                        PreviewMouseLeftButtonDown="ComboBoxFloatPanelKeyBinding_OnPreviewMouseLeftButtonDown"
+                        SelectionChanged="ComboBoxFloatPanelKeyBinding_OnSelectionChanged"
+                        ToolTip="Key binding to toggle floating pop out on and off"
+                        Visibility="{c:Binding DataItem.FloatingPanel.IsEnabled}" />
                 </WrapPanel>
             </StackPanel>
         </Expander>
diff --git a/MainApp/AppUserControl/PopOutPanelConfigCard.xaml.cs b/MainApp/AppUserControl/PopOutPanelConfigCard.xaml.cs
index 0f6d281..e303d9d 100644
--- a/MainApp/AppUserControl/PopOutPanelConfigCard.xaml.cs
+++ b/MainApp/AppUserControl/PopOutPanelConfigCard.xaml.cs
@@ -1,13 +1,15 @@
-using System;
+using Microsoft.Extensions.DependencyInjection;
+using MSFSPopoutPanelManager.DomainModel.Profile;
+using MSFSPopoutPanelManager.MainApp.AppUserControl.PopOutPanelCard;
+using MSFSPopoutPanelManager.MainApp.ViewModel;
+using System;
+using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
-using Microsoft.Extensions.DependencyInjection;
-using MSFSPopoutPanelManager.DomainModel.Profile;
-using MSFSPopoutPanelManager.MainApp.AppUserControl.PopOutPanelCard;
-using MSFSPopoutPanelManager.MainApp.ViewModel;
 
 namespace MSFSPopoutPanelManager.MainApp.AppUserControl
 {
@@ -66,6 +68,75 @@ namespace MSFSPopoutPanelManager.MainApp.AppUserControl
 
             if (!string.IsNullOrEmpty(param))
                 _viewModel.PanelAttributeUpdatedCommand.Execute(param);
+
+            if (sender is ToggleButton { Name: "TglBtnAllowFloatPanel" })
+                ComboBoxFloatPanelKeyBinding.SelectedIndex = 0;
+        }
+
+        private void ComboBoxFloatPanelKeyBinding_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            var comboBox = (ComboBox)sender;
+
+            if (comboBox.SelectedIndex is 0 or -1)
+            {
+                _viewModel.DataItem.FloatingPanel.KeyBinding = null;
+                return;
+            }
+
+            var selectedValue = comboBox.SelectedValue.ToString();
+
+            if (_viewModel.ActiveProfile.PanelConfigs.Any(x => x.FloatingPanel.KeyBinding == selectedValue && x.Id != _viewModel.DataItem.Id))
+                comboBox.SelectedIndex = 0;
+
+
+            _viewModel.DataItem.FloatingPanel.KeyBinding = selectedValue;
+        }
+        
+        private readonly List<string> _floatKeyBindings = new()
+        {
+            "",
+            "Ctrl-1",
+            "Ctrl-2",
+            "Ctrl-3",
+            "Ctrl-4",
+            "Ctrl-5",
+            "Ctrl-6",
+            "Ctrl-7",
+            "Ctrl-8",
+            "Ctrl-9",
+            "Ctrl-0"
+        };
+
+        private void ComboBoxFloatPanelKeyBinding_OnPreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            BindFloatPanelKeyBinding();
+        }
+
+        private void ComboBoxFloatPanelKeyBinding_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            BindFloatPanelKeyBinding();
+        }
+
+        private void BindFloatPanelKeyBinding()
+        {
+            var items = new List<string>();
+            items.AddRange(_floatKeyBindings);
+
+            foreach (var panelConfig in _viewModel.ActiveProfile.PanelConfigs)
+            {
+                if (panelConfig.FloatingPanel.KeyBinding != null && panelConfig.Id != _viewModel.DataItem.Id)
+                    items.Remove(panelConfig.FloatingPanel.KeyBinding);
+            }
+
+            ComboBoxFloatPanelKeyBinding.ItemsSource = items;
+
+            var index = items.ToList().FindIndex(x => string.Equals(x, _viewModel.DataItem.FloatingPanel.KeyBinding, StringComparison.CurrentCultureIgnoreCase));
+
+            if (index == -1)
+                return;
+
+            this.ComboBoxFloatPanelKeyBinding.SelectedIndex = index;
         }
     }
 }
+
diff --git a/MainApp/MainApp.csproj b/MainApp/MainApp.csproj
index f9e73f5..a8128d2 100644
--- a/MainApp/MainApp.csproj
+++ b/MainApp/MainApp.csproj
@@ -14,9 +14,9 @@
 		<RootNamespace>MSFSPopoutPanelManager.MainApp</RootNamespace>
 		<ApplicationIcon>logo.ico</ApplicationIcon>
 		<Platforms>x64</Platforms>
-		<Version>4.1.0.1</Version>
-		<AssemblyVersion>4.1.0.1</AssemblyVersion>
-		<FileVersion>4.1.0.1</FileVersion>
+		<Version>4.1.0.2</Version>
+		<AssemblyVersion>4.1.0.2</AssemblyVersion>
+		<FileVersion>4.1.0.2</FileVersion>
 		<DebugType>embedded</DebugType>
 		<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
 		<!-- Publishing options -->
diff --git a/MainApp/ViewModel/PopOutPanelConfigCardViewModel.cs b/MainApp/ViewModel/PopOutPanelConfigCardViewModel.cs
index 7e519ab..d2edcf6 100644
--- a/MainApp/ViewModel/PopOutPanelConfigCardViewModel.cs
+++ b/MainApp/ViewModel/PopOutPanelConfigCardViewModel.cs
@@ -108,7 +108,7 @@ namespace MSFSPopoutPanelManager.MainApp.ViewModel
                 ActiveProfile.CurrentMoveResizePanelId = DataItem.Id;
 
                 if (!AppSettingData.ApplicationSetting.KeyboardShortcutSetting.IsEnabled)
-                    InputHookManager.StartKeyboardHook();
+                    InputHookManager.StartKeyboardHook("KeyboardShortcut");
 
                 InputHookManager.OnKeyUp -= HandleKeyUpEvent;
                 InputHookManager.OnKeyUp += HandleKeyUpEvent;
@@ -118,7 +118,7 @@ namespace MSFSPopoutPanelManager.MainApp.ViewModel
                 ActiveProfile.CurrentMoveResizePanelId = Guid.Empty;
 
                 if (!AppSettingData.ApplicationSetting.KeyboardShortcutSetting.IsEnabled)
-                    InputHookManager.EndKeyboardHook();
+                    InputHookManager.EndKeyboardHook("KeyboardShortcut");
 
                 InputHookManager.OnKeyUp -= HandleKeyUpEvent;
             }
diff --git a/Orchestration/AppOrchestrator.cs b/Orchestration/AppOrchestrator.cs
index d2cac5f..9174112 100644
--- a/Orchestration/AppOrchestrator.cs
+++ b/Orchestration/AppOrchestrator.cs
@@ -58,7 +58,7 @@ namespace MSFSPopoutPanelManager.Orchestration
             _panelConfigurationOrchestrator.EndConfiguration();
             _panelConfigurationOrchestrator.EndTouchHook();
 
-            InputHookManager.EndKeyboardHook();
+            InputHookManager.EndKeyboardHookForced();
             _flightSimOrchestrator.EndSimConnectServer(true);
         }
 
diff --git a/Orchestration/KeyboardOrchestrator.cs b/Orchestration/KeyboardOrchestrator.cs
index 9614510..d874a9d 100644
--- a/Orchestration/KeyboardOrchestrator.cs
+++ b/Orchestration/KeyboardOrchestrator.cs
@@ -1,46 +1,112 @@
-using MSFSPopoutPanelManager.WindowsAgent;
+using System.Linq;
+using System.Security.Cryptography.X509Certificates;
+using MSFSPopoutPanelManager.DomainModel.Profile;
+using MSFSPopoutPanelManager.WindowsAgent;
 
 namespace MSFSPopoutPanelManager.Orchestration
 {
     public class KeyboardOrchestrator : BaseOrchestrator
     {
         private readonly PanelPopOutOrchestrator _panelPopOutOrchestrator;
+        private readonly PanelConfigurationOrchestrator _panelConfigurationOrchestrator;
 
-        public KeyboardOrchestrator(SharedStorage sharedStorage, PanelPopOutOrchestrator panelPopOutOrchestrator) : base(sharedStorage)
+        public KeyboardOrchestrator(SharedStorage sharedStorage, PanelPopOutOrchestrator panelPopOutOrchestrator, PanelConfigurationOrchestrator panelConfigurationOrchestrator) : base(sharedStorage)
         {
             _panelPopOutOrchestrator = panelPopOutOrchestrator;
+            _panelConfigurationOrchestrator = panelConfigurationOrchestrator;
         }
 
         public void Initialize()
         {
             if (AppSettingData.ApplicationSetting.KeyboardShortcutSetting.IsEnabled)
             {
-                InputHookManager.StartKeyboardHook();
-                InputHookManager.OnKeyUp -= HandleKeyboardHookKeyUpEvent;
-                InputHookManager.OnKeyUp += HandleKeyboardHookKeyUpEvent;
+                InputHookManager.StartKeyboardHook("KeyboardShortcut");
+                InputHookManager.OnKeyUp -= HandleShortcutKeyboardHookKeyUpEvent;
+                InputHookManager.OnKeyUp += HandleShortcutKeyboardHookKeyUpEvent;
             }
 
             AppSettingData.ApplicationSetting.OnIsUsedKeyboardShortcutChanged += (_, e) =>
             {
                 if (e)
                 {
-                    InputHookManager.StartKeyboardHook();
-                    InputHookManager.OnKeyUp -= HandleKeyboardHookKeyUpEvent;
-                    InputHookManager.OnKeyUp += HandleKeyboardHookKeyUpEvent;
+                    InputHookManager.StartKeyboardHook("KeyboardShortcut");
+                    InputHookManager.OnKeyUp -= HandleShortcutKeyboardHookKeyUpEvent;
+                    InputHookManager.OnKeyUp += HandleShortcutKeyboardHookKeyUpEvent;
                 }
                 else
                 {
-                    InputHookManager.EndKeyboardHook();
-                    InputHookManager.OnKeyUp -= HandleKeyboardHookKeyUpEvent;
+                    InputHookManager.EndKeyboardHook("KeyboardShortcut");
+                    InputHookManager.OnKeyUp -= HandleShortcutKeyboardHookKeyUpEvent;
+                }
+            };
+
+            if (ProfileData.ActiveProfile.PanelConfigs.Any(x => x.FloatingPanel.IsEnabled))
+            {
+                InputHookManager.StartKeyboardHook("FloatingPanel");
+                InputHookManager.OnKeyUp -= HandleFloatingPanelKeyboardHookKeyUpEvent;
+                InputHookManager.OnKeyUp += HandleFloatingPanelKeyboardHookKeyUpEvent;
+            }
+
+
+            ProfileData.ActiveProfile.OnUseFloatingPanelChanged += (_, e) =>
+            {
+                if (e)
+                {
+                    InputHookManager.StartKeyboardHook("FloatingPanel");
+                    InputHookManager.OnKeyUp -= HandleFloatingPanelKeyboardHookKeyUpEvent;
+                    InputHookManager.OnKeyUp += HandleFloatingPanelKeyboardHookKeyUpEvent;
+                }
+                else
+                {
+                    InputHookManager.EndKeyboardHook("FloatingPanel");
+                    InputHookManager.OnKeyUp -= HandleFloatingPanelKeyboardHookKeyUpEvent;
                 }
             };
         }
 
-        public async void HandleKeyboardHookKeyUpEvent(object sender, KeyUpEventArgs e)
+        public async void HandleShortcutKeyboardHookKeyUpEvent(object sender, KeyUpEventArgs e)
         {
             // Start pop out
-            if (e.IsHoldControl && e.IsHoldShift && e.KeyCode.ToUpper() == AppSettingData.ApplicationSetting.KeyboardShortcutSetting.StartPopOutKeyBinding)
+            if (e.IsHoldControl && e.IsHoldShift && e.KeyCode.ToUpper() ==
+                AppSettingData.ApplicationSetting.KeyboardShortcutSetting.StartPopOutKeyBinding)
+            {
                 await _panelPopOutOrchestrator.ManualPopOut();
+                return;
+            }
+        }
+
+        public void HandleFloatingPanelKeyboardHookKeyUpEvent(object sender, KeyUpEventArgs e)
+        {
+            if (e.IsHoldControl)
+            {
+                switch (e.KeyCode)
+                {
+                    case "D1":
+                    case "D2":
+                    case "D3":
+                    case "D4":
+                    case "D5":
+                    case "D6":
+                    case "D7":
+                    case "D8":
+                    case "D9":
+                    case "D0":
+                        _panelConfigurationOrchestrator.ToggleFloatPanel($"Ctrl-{e.KeyCode[1..]}");
+                        break;
+                    case "NumPad1":
+                    case "NumPad2":
+                    case "NumPad3":
+                    case "NumPad4":
+                    case "NumPad5":
+                    case "NumPad6":
+                    case "NumPad7":
+                    case "NumPad8":
+                    case "NumPad9":
+                    case "NumPad0":
+                        _panelConfigurationOrchestrator.ToggleFloatPanel($"Ctrl-{e.KeyCode[6..]}");
+                        break;
+                }
+            }
         }
     }
 }
diff --git a/Orchestration/Orchestration.csproj b/Orchestration/Orchestration.csproj
index 53d0ac9..39dedcb 100644
--- a/Orchestration/Orchestration.csproj
+++ b/Orchestration/Orchestration.csproj
@@ -11,9 +11,9 @@
     <PackageProjectUrl>https://github.com/hawkeye-stan/msfs-popout-panel-manager</PackageProjectUrl>
     <RootNamespace>MSFSPopoutPanelManager.Orchestration</RootNamespace>
     <Platforms>x64</Platforms>
-    <Version>4.1.0.1</Version>
-    <AssemblyVersion>4.1.0.1</AssemblyVersion>
-    <FileVersion>4.1.0.1</FileVersion>
+    <Version>4.1.0.2</Version>
+    <AssemblyVersion>4.1.0.2</AssemblyVersion>
+    <FileVersion>4.1.0.2</FileVersion>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <DebugType>Embedded</DebugType>
     <Configurations>Debug;Release;Local</Configurations>
diff --git a/Orchestration/PanelConfigurationOrchestrator.cs b/Orchestration/PanelConfigurationOrchestrator.cs
index 3d2cf1d..131504e 100644
--- a/Orchestration/PanelConfigurationOrchestrator.cs
+++ b/Orchestration/PanelConfigurationOrchestrator.cs
@@ -154,5 +154,34 @@ namespace MSFSPopoutPanelManager.Orchestration
                 ProfileData.WriteProfiles();
             }
         }
+
+        public void ToggleFloatPanel(string keyBinding)
+        {
+            var panel = ActiveProfile.PanelConfigs.FirstOrDefault(x => string.Equals(x.FloatingPanel.KeyBinding, keyBinding, StringComparison.CurrentCultureIgnoreCase));
+
+            if (panel == null)
+                return;
+
+            if (!panel.FloatingPanel.IsEnabled || panel.FullScreen)
+                return;
+
+            if (panel.PanelType is not (PanelType.CustomPopout or PanelType.BuiltInPopout)) 
+                return;
+
+            if (panel.IsPopOutSuccess == null || !(bool)panel.IsPopOutSuccess)
+                return;
+
+            if (!panel.IsFloating)
+            {
+                panel.IsFloating = true;
+                WindowActionManager.RestoreWindow(panel.PanelHandle);
+                WindowActionManager.ApplyAlwaysOnTop(panel.PanelHandle, panel.PanelType, true);
+            }
+            else
+            {
+                panel.IsFloating = false;
+                WindowActionManager.MinimizeWindow(panel.PanelHandle);
+            }
+        }
     }
 }
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 15721a4..fc91458 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -2,12 +2,14 @@
 
 * Added new method to select panel source for an aircraft profile using fixed camera view instead of relying saved custom camera view. Previous method of using saved custom camera view is still available to use if desire.
 
-Video showing how to create a new profile using the new panel selection method: https://vimeo.com/917361559
+Video showing how to create a new aircraft profile using the new panel selection method: https://vimeo.com/917361559
 
-Video showing how to update existing profile to use the new panel selection method: https://vimeo.com/917364912 
+Video showing how to update existing aircraft profile to use the new panel selection method: https://vimeo.com/917364912 
 
 * Added new virtual number pad to be used for touch enabled screen. This number pad will first focus the game window before sending num pad keystroke to the game.
 
+* Added new feature to allow pop up panel as floating window. You can assign hotkeys (Ctrl-0 to Ctrl-9) to have the pop out to toggle either showing on screen or minimize.
+
 * Added a new button to easily close all Pop Out Panel Manager's managed pop outs.
 
 * Fixed few reported bugs in the application.
\ No newline at end of file
diff --git a/Shared/QualifyFullName.cs b/Shared/QualifyFullName.cs
new file mode 100644
index 0000000..84e8499
--- /dev/null
+++ b/Shared/QualifyFullName.cs
@@ -0,0 +1,14 @@
+namespace MSFSPopoutPanelManager.Shared
+{
+    public static class QualifyFullName
+    {
+        public static string Of(string _, [System.Runtime.CompilerServices.CallerArgumentExpression("_")] string fullTypeName = "")
+        {
+            if (fullTypeName.StartsWith("nameof(") && fullTypeName.EndsWith(")"))
+            {
+                return fullTypeName[7..^1];
+            }
+            return fullTypeName;
+        }
+    }
+}
diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj
index b5dfb8f..f1c4306 100644
--- a/Shared/Shared.csproj
+++ b/Shared/Shared.csproj
@@ -11,9 +11,9 @@
     <PackageProjectUrl>https://github.com/hawkeye-stan/msfs-popout-panel-manager</PackageProjectUrl>
     <RootNamespace>MSFSPopoutPanelManager.Shared</RootNamespace>
     <Platforms>x64</Platforms>
-    <Version>4.1.0.1</Version>
-    <AssemblyVersion>4.1.0.1</AssemblyVersion>
-    <FileVersion>4.1.0.1</FileVersion>
+    <Version>4.1.0.2</Version>
+    <AssemblyVersion>4.1.0.2</AssemblyVersion>
+    <FileVersion>4.1.0.2</FileVersion>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <DebugType>Embedded</DebugType>
     <Configurations>Debug;Release;Local</Configurations>
diff --git a/SimconnectAgent/SimconnectAgent.csproj b/SimconnectAgent/SimconnectAgent.csproj
index 0b53eea..4317c62 100644
--- a/SimconnectAgent/SimconnectAgent.csproj
+++ b/SimconnectAgent/SimconnectAgent.csproj
@@ -11,9 +11,9 @@
     <PackageProjectUrl>https://github.com/hawkeye-stan/msfs-popout-panel-manager</PackageProjectUrl>
     <RootNamespace>MSFSPopoutPanelManager.SimConnectAgent</RootNamespace>
     <Platforms>x64</Platforms>
-    <Version>4.1.0.1</Version>
-    <AssemblyVersion>4.1.0.1</AssemblyVersion>
-    <FileVersion>4.1.0.1</FileVersion>
+    <Version>4.1.0.2</Version>
+    <AssemblyVersion>4.1.0.2</AssemblyVersion>
+    <FileVersion>4.1.0.2</FileVersion>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <DebugType>Embedded</DebugType>
     <Configurations>Debug;Release;Local</Configurations>
diff --git a/VERSION.md b/VERSION.md
index b7a8a2d..961fd18 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -5,15 +5,17 @@
 
 * Added new method to select panel source for an aircraft profile using fixed camera view instead of relying saved custom camera view. Previous method of using saved custom camera view is still available to use if desire.
 
-Video showing how to create a new profile using the new panel selection method: https://vimeo.com/917361559
+Video showing how to create a new aircraft profile using the new panel selection method: https://vimeo.com/917361559
 
-Video showing how to update existing profile to use the new panel selection method: https://vimeo.com/917364912 
+Video showing how to update existing aircraft profile to use the new panel selection method: https://vimeo.com/917364912 
 
 * Added new virtual number pad to be used for touch enabled screen. This number pad will first focus the game window before sending num pad keystroke to the game.
 
-* Added a new button to easily close all Pop Out Panel Manager's managed pop outs. 
+* Added new feature to allow pop up panel as floating window. You can assign hotkeys (Ctrl-0 to Ctrl-9) to have the pop out to toggle either showing on screen or minimize.
 
-* Fixed few outstanding bugs in the application.
+* Added a new button to easily close all Pop Out Panel Manager's managed pop outs.
+
+* Fixed few reported bugs in the application.
 
 ## Version 4.0.3
 
diff --git a/WindowsAgent/InputHookManager.cs b/WindowsAgent/InputHookManager.cs
index 1617af4..19a1c92 100644
--- a/WindowsAgent/InputHookManager.cs
+++ b/WindowsAgent/InputHookManager.cs
@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
+using System.Linq;
 using WindowsHook;
 
 namespace MSFSPopoutPanelManager.WindowsAgent
@@ -15,6 +17,8 @@ namespace MSFSPopoutPanelManager.WindowsAgent
         private static IKeyboardMouseEvents _keyboardHook;
         public static event EventHandler<KeyUpEventArgs> OnKeyUp;
 
+        private static List<string> _keyboardHookSubscribers = new List<string>();
+
         public static void StartMouseHook()
         {
             if (_mouseHook == null)
@@ -51,12 +55,12 @@ namespace MSFSPopoutPanelManager.WindowsAgent
                 OnLeftClick?.Invoke(null, new Point(e.X, e.Y));
         }
 
-        public static void StartKeyboardHook()
+        public static void StartKeyboardHook(string subscriber)
         {
-            if (_keyboardHook != null)
-                EndKeyboardHook();
+            if(!_keyboardHookSubscribers.Contains(subscriber))
+                _keyboardHookSubscribers.Add(subscriber);
 
-            if (_keyboardHook == null)
+            if (_keyboardHook == null && _keyboardHookSubscribers.Count > 0)
             {
                 Debug.WriteLine("Starting Keyboard Hook...");
 
@@ -65,14 +69,35 @@ namespace MSFSPopoutPanelManager.WindowsAgent
             }
         }
 
-        public static void EndKeyboardHook()
+        public static void EndKeyboardHook(string subscriber)
         {
-            if (_keyboardHook != null)
+            _keyboardHookSubscribers.Remove(subscriber);
+
+            if (_keyboardHook != null && _keyboardHookSubscribers.Count == 0)
             {
                 Debug.WriteLine("Ending Keyboard Hook...");
                 _keyboardHook.KeyUp -= HandleKeyboardHookKeyUp;
                 _keyboardHook.Dispose();
                 _keyboardHook = null;
+
+                if (OnKeyUp != null)
+                {
+                    foreach (Delegate d in OnKeyUp.GetInvocationList())
+                        OnKeyUp -= (EventHandler<KeyUpEventArgs>)d;
+                }
+            }
+        }
+
+        public static void EndKeyboardHookForced()
+        {
+            _keyboardHookSubscribers.Clear();
+
+            if (_keyboardHook != null)
+            {
+                Debug.WriteLine("Ending Keyboard Hook (forced)...");
+                _keyboardHook.KeyUp -= HandleKeyboardHookKeyUp;
+                _keyboardHook.Dispose();
+                _keyboardHook = null;
             }
 
             if (OnKeyUp != null)
diff --git a/WindowsAgent/WindowActionManager.cs b/WindowsAgent/WindowActionManager.cs
index 40c9abe..3783015 100644
--- a/WindowsAgent/WindowActionManager.cs
+++ b/WindowsAgent/WindowActionManager.cs
@@ -89,6 +89,11 @@ namespace MSFSPopoutPanelManager.WindowsAgent
             PInvoke.ShowWindow(hwnd, PInvokeConstant.SW_MINIMIZE);
         }
 
+        public static void RestoreWindow(IntPtr hwnd)
+        {
+            PInvoke.ShowWindow(hwnd, PInvokeConstant.SW_RESTORE);
+        }
+
         public static void BringWindowToForeground(IntPtr hwnd)
         {
             PInvoke.ShowWindowAsync(new HandleRef(null, hwnd), PInvokeConstant.SW_RESTORE);
diff --git a/WindowsAgent/WindowEventManager.cs b/WindowsAgent/WindowEventManager.cs
index e4e7f34..b6fec17 100644
--- a/WindowsAgent/WindowEventManager.cs
+++ b/WindowsAgent/WindowEventManager.cs
@@ -110,6 +110,9 @@ namespace MSFSPopoutPanelManager.WindowsAgent
                 case PInvokeConstant.EVENT_OBJECT_STATECHANGE:
                     if (!ActiveProfile.IsLocked)
                     {
+                        if (panelConfig.FloatingPanel.IsEnabled && panelConfig.IsFloating)       // do not update coordinate if floating window
+                            return;
+
                         Thread.Sleep(300);
                         UpdatePanelCoordinates(panelConfig);
                     }
@@ -135,6 +138,9 @@ namespace MSFSPopoutPanelManager.WindowsAgent
                             break;
                         }
 
+                        if (panelConfig.FloatingPanel.IsEnabled && !panelConfig.IsFloating)      
+                            return;
+
                         switch (wp.showCmd)
                         {
                             case PInvokeConstant.SW_SHOWMAXIMIZED when _prevShowWinCmd == PInvokeConstant.SW_SHOWNORMAL:
diff --git a/WindowsAgent/WindowsAgent.csproj b/WindowsAgent/WindowsAgent.csproj
index 4631065..ea2cf47 100644
--- a/WindowsAgent/WindowsAgent.csproj
+++ b/WindowsAgent/WindowsAgent.csproj
@@ -11,9 +11,9 @@
     <PackageProjectUrl>https://github.com/hawkeye-stan/msfs-popout-panel-manager</PackageProjectUrl>
     <RootNamespace>MSFSPopoutPanelManager.WindowsAgent</RootNamespace>
     <Platforms>x64</Platforms>
-    <Version>4.1.0.1</Version>
-    <AssemblyVersion>4.1.0.1</AssemblyVersion>
-    <FileVersion>4.1.0.1</FileVersion>
+    <Version>4.1.0.2</Version>
+    <AssemblyVersion>4.1.0.2</AssemblyVersion>
+    <FileVersion>4.1.0.2</FileVersion>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <DebugType>Embedded</DebugType>
     <Configurations>Debug;Release;Local</Configurations>