Merge remote-tracking branch 'refs/remotes/barotrauma/combat-mission'

Conflicts: Subsurface/Source/GUI/GUIListBox.cs
2016-10-04 22:30:29 -03:00
parent 4874ad2ef8 bddcc36673
commit 14ae355f19
29 changed files with 525 additions and 440 deletions
@@ -287,6 +287,36 @@ namespace Barotrauma
            {
                scrollBar.BarScroll -= (PlayerInput.ScrollWheelSpeed / 500.0f) * BarSize;
            }
+
+            for (int i = 0; i < children.Count; i++)
+            {
+                GUIComponent child = children[i];
+                if (child == frame || !child.Visible) continue;
+                
+                if (enabled && child.CanBeFocused &&
+                    (MouseOn == this || (MouseOn != null && this.IsParentOf(MouseOn))) && child.Rect.Contains(PlayerInput.MousePosition))
+                {
+                    child.State = ComponentState.Hover;
+                    if (PlayerInput.LeftButtonClicked())
+                    {
+                        Debug.WriteLine("clicked");
+                        Select(i);
+                    }
+                }
+                else if (selected.Contains(child))
+                {
+                    child.State = ComponentState.Selected;
+
+                    if (CheckSelected != null)
+                    {
+                        if (CheckSelected() != child.UserData) selected.Remove(child);
+                    }
+                }
+                else
+                {
+                    child.State = ComponentState.None;
+                }
+            }
        }

        public void Select(int childIndex, bool force = false)
@@ -448,7 +478,7 @@ namespace Barotrauma
                        continue;
                    }
                }
-
+                
                child.Draw(spriteBatch);
            }