fixed topmost issue

foglio1024 · May 14, 2017 · 5112b97 · 5112b97
1 parent 04cfc5e
commit 5112b97
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 84 deletions.
diff --git a/TCC.UI/ViewModels/AbnormalityWindowViewModel.cs b/TCC.UI/ViewModels/AbnormalityWindowViewModel.cs
@@ -14,19 +14,6 @@ public bool IsTeraOnTop
         {
             get => WindowManager.IsTccVisible;
         }
-        private bool topMost;
-        public bool TopMost
-        {
-            get => topMost;
-            set
-            {
-                if (topMost != value)
-                {
-                    topMost = value;
-                    RaisePropertyChanged("TopMost");
-                }
-            }
-        }
 
         public AbnormalityWindowViewModel()
         {
@@ -35,8 +22,11 @@ public AbnormalityWindowViewModel()
                 RaisePropertyChanged("IsTeraOnTop");
                 if (IsTeraOnTop)
                 {
-                    TopMost = false;
-                    TopMost = true;
+                    BuffBarWindowManager.Instance.Dispatcher.Invoke(() =>
+                    {
+                        WindowManager.BuffBar.Topmost = false;
+                        WindowManager.BuffBar.Topmost = true;
+                    });
                 }
             };
         }

diff --git a/TCC.UI/ViewModels/BossGageWindowViewModel.cs b/TCC.UI/ViewModels/BossGageWindowViewModel.cs
@@ -1,4 +1,6 @@
-namespace TCC.ViewModels
+using System;
+
+namespace TCC.ViewModels
 {
     public class BossGageWindowViewModel : BaseINPC
     {
@@ -15,19 +17,6 @@ public bool IsTeraOnTop
         {
             get => WindowManager.IsTccVisible;
         }
-        private bool topMost;
-        public bool TopMost
-        {
-            get => topMost;
-            set
-            {
-                if (topMost != value)
-                {
-                    topMost = value;
-                    RaisePropertyChanged("TopMost");
-                }
-            }
-        }
 
         public BossGageWindowViewModel()
         {
@@ -37,8 +26,11 @@ public BossGageWindowViewModel()
                 RaisePropertyChanged("IsTeraOnTop");
                 if (IsTeraOnTop)
                 {
-                    TopMost = false;
-                    TopMost = true;
+                    BossGageWindowManager.Instance.Dispatcher.Invoke(() =>
+                    {
+                        WindowManager.BossGauge.Topmost = false;
+                        WindowManager.BossGauge.Topmost = true;
+                    });
                 }
             };
 

diff --git a/TCC.UI/ViewModels/CharacterWindowViewModel.cs b/TCC.UI/ViewModels/CharacterWindowViewModel.cs
@@ -1,4 +1,5 @@
-using TCC.Data;
+using System;
+using TCC.Data;
 
 namespace TCC.ViewModels
 {
@@ -17,20 +18,6 @@ private void Player_PropertyChanged(object sender, System.ComponentModel.Propert
             }
         }
 
-        private bool topMost;
-        public bool TopMost
-        {
-            get => topMost;
-            set
-            {
-                if (topMost != value)
-                {
-                    topMost = value;
-                    RaisePropertyChanged("TopMost");
-                }
-            }
-        }
-
 
         public CharacterWindowViewModel()
         {
@@ -39,8 +26,11 @@ public CharacterWindowViewModel()
                 RaisePropertyChanged("IsTeraOnTop");
                 if (IsTeraOnTop)
                 {
-                    TopMost = false;
-                    TopMost = true;
+                    CharacterWindowManager.Instance.Dispatcher.Invoke(() =>
+                    {
+                        WindowManager.CharacterWindow.Topmost = false;
+                        WindowManager.CharacterWindow.Topmost = true;
+                    });
                 }
             };
         }

diff --git a/TCC.UI/ViewModels/CooldownWindowViewModel.cs b/TCC.UI/ViewModels/CooldownWindowViewModel.cs
@@ -15,29 +15,18 @@ public bool IsTeraOnTop
             get => WindowManager.IsTccVisible;
         }
 
-        private bool topMost;
-        public bool TopMost
-        {
-            get => topMost;
-            set
-            {
-                if (topMost != value)
-                {
-                    topMost = value;
-                    RaisePropertyChanged("TopMost");
-                }
-            }
-        }
-
         public CooldownWindowViewModel()
         {
             WindowManager.TccVisibilityChanged += (s, ev) =>
             {
                 RaisePropertyChanged("IsTeraOnTop");
                 if (IsTeraOnTop)
                 {
-                    TopMost = false;
-                    TopMost = true;
+                    WindowManager.CooldownWindow.Dispatcher.Invoke(() =>
+                    {
+                       WindowManager.CooldownWindow.Topmost = false;
+                       WindowManager.CooldownWindow.Topmost = true;
+                    });
                 }
             };
         }

diff --git a/TCC.UI/ViewModels/GroupWindowViewModel.cs b/TCC.UI/ViewModels/GroupWindowViewModel.cs
@@ -13,19 +13,6 @@ public bool IsTeraOnTop
         {
             get => WindowManager.IsTccVisible;
         }
-        private bool topMost;
-        public bool TopMost
-        {
-            get => topMost;
-            set
-            {
-                if (topMost != value)
-                {
-                    topMost = value;
-                    RaisePropertyChanged("TopMost");
-                }
-            }
-        }
 
         public GroupWindowViewModel()
         {
@@ -34,8 +21,11 @@ public GroupWindowViewModel()
                 RaisePropertyChanged("IsTeraOnTop");
                 if (IsTeraOnTop)
                 {
-                    TopMost = false;
-                    TopMost = true;
+                    GroupWindowManager.Instance.Dispatcher.Invoke(() =>
+                    {
+                        WindowManager.GroupWindow.Topmost = false;
+                        WindowManager.GroupWindow.Topmost = true;
+                    });
                 }
             };
         }

diff --git a/TCC.UI/Windows/AbnormalitiesWindow.xaml b/TCC.UI/Windows/AbnormalitiesWindow.xaml
@@ -8,7 +8,7 @@
         xmlns:vm="clr-namespace:TCC.ViewModels"
         mc:Ignorable="d"
         Title="AbnormalitiesWindow" Height="Auto" Width="Auto"
-        Topmost="{Binding TopMost}"
+        Topmost="True"
         ShowInTaskbar="False"
         WindowStyle="None"
         Background="#00000000"

diff --git a/TCC.UI/Windows/BossGageWindow.xaml b/TCC.UI/Windows/BossGageWindow.xaml
@@ -11,7 +11,7 @@
         mc:Ignorable="d"
         Title="BossGageWindow" Height="Auto" Width="Auto"
         SizeToContent="WidthAndHeight"
-        Topmost="{Binding TopMost}"
+        Topmost="True"
         AllowsTransparency="True"
         ShowInTaskbar="False"
         WindowStyle="None" Opacity=".85"

diff --git a/TCC.UI/Windows/CharacterWindow.xaml b/TCC.UI/Windows/CharacterWindow.xaml
@@ -10,7 +10,7 @@
         mc:Ignorable="d"
         Title="HPbar" 
         Height="Auto" Width="Auto"
-        Topmost="{Binding TopMost}" 
+        Topmost="True" 
         Background="#00000000" 
         ShowInTaskbar="False" 
         WindowStyle="None" 

diff --git a/TCC.UI/Windows/CooldownWindow.xaml b/TCC.UI/Windows/CooldownWindow.xaml
@@ -11,7 +11,7 @@
         Height="Auto" 
         Width="Auto" 
         SizeToContent="WidthAndHeight" 
-        Topmost="{Binding TopMost}" 
+        Topmost="True" 
         AllowsTransparency="True" 
         ShowInTaskbar="False" 
         WindowStyle="None" 

diff --git a/TCC.UI/Windows/GroupWindow.xaml b/TCC.UI/Windows/GroupWindow.xaml
@@ -12,7 +12,7 @@
                  WindowStyle="None"
                  AllowsTransparency="True"
                  ResizeMode="NoResize"
-                 Topmost="{Binding TopMost}"
+                 Topmost="True"
                  Opacity=".9" SizeToContent="WidthAndHeight"
                  Background="Transparent"
                  Title="GroupWindow" Height="Auto" Width="Auto"