Merge remote-tracking branch 'Peppie23/targetwindow_lag' into 1.6.0

RemoteTechnologiesGroup · Jan 11, 2015 · 2274fe5 · 2274fe5
2 parents 9db6347 + e3c18a0
commit 2274fe5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/RemoteTech/UI/AntennaWindow.cs b/src/RemoteTech/UI/AntennaWindow.cs
@@ -107,7 +107,7 @@ public override void Window(int uid)
         /// </summary>
         public void mouseOverAntennaWindow()
         {
-            mAntennaFragment.triggerMouseOverListEntry = backupPosition.Contains(Event.current.mousePosition);
+            mAntennaFragment.triggerMouseOverListEntry = backupPosition.ContainsMouse();
         }
 
         public void OnVesselChange(Vessel v)

diff --git a/src/RemoteTech/UI/FilterOverlay.cs b/src/RemoteTech/UI/FilterOverlay.cs
@@ -288,9 +288,10 @@ public void Draw()
             }
 
             // Draw Antenna Selector
+            mAntennaFragment.triggerMouseOverListEntry = PositionAntenna.Contains(Event.current.mousePosition) && mEnabled;
+
             if (mEnabled && mSatelliteFragment.Satellite != null && mAntennaFragment.Antenna != null)
             {
-                mAntennaFragment.triggerMouseOverListEntry = PositionAntenna.Contains(Event.current.mousePosition);
                 GUILayout.BeginArea(PositionAntenna, AbstractWindow.Frame);
                 {
                     mAntennaFragment.Draw();
@@ -406,6 +407,7 @@ private void OnClickStatus()
             if (mEnabled)
             {
                 mEnabled = false;
+                mTargetInfos.Hide();
             }
             else if (StyleStatusButton != Style.ButtonRed && StyleStatusButton != Style.ButtonGray)
             {