Unstable v0.19.3.0

2022-09-02 15:10:56 -03:00
parent 28789616bd
commit 3f2c843247
336 changed files with 7152 additions and 7739 deletions
@@ -1018,6 +1018,11 @@ namespace Barotrauma

                    if (c.Enabled)
                    {
+                        var dragHandle = c as GUIDragHandle ?? parent as GUIDragHandle;
+                        if (dragHandle != null)
+                        {
+                            return dragHandle.Dragging ? CursorState.Dragging : CursorState.Hand;
+                        }
                        // Some parent elements take priority
                        // but not when the child is a GUIButton or GUITickBox
                        if (!(parent is GUIButton) && !(parent is GUIListBox) ||
@@ -1027,6 +1032,7 @@ namespace Barotrauma
                        }
                    }

+
                    // Children in list boxes can be interacted with despite not having
                    // a GUIButton inside of them so instead of hard coding we check if
                    // the children can be interacted with by checking their hover state
@@ -1097,6 +1103,8 @@ namespace Barotrauma
                                        return list;
                                    case GUIScrollBar bar:
                                        return bar;
+                                    case GUIDragHandle dragHandle:
+                                        return dragHandle;
                                }
                            }
                            component = parent;