fix lib imports and extract UIFocusMixin from UIFocusGroup

Author: eruvanos

arcade/gui/experimental/focus.py

@@ -5,26 +5,24 @@
 
 import arcade
 from arcade import MOUSE_BUTTON_LEFT
-from arcade.gui import (
-    ListProperty,
-    Property,
-    Surface,
-    UIAnchorLayout,
+from arcade.gui.events import (
     UIEvent,
-    UIInteractiveWidget,
     UIKeyPressEvent,
     UIKeyReleaseEvent,
-    UIManager,
     UIMousePressEvent,
     UIMouseReleaseEvent,
-    UIWidget,
-    bind,
 )
 from arcade.gui.experimental.controller import (
     UIControllerButtonPressEvent,
     UIControllerButtonReleaseEvent,
     UIControllerDpadEvent,
 )
+from arcade.gui.property import ListProperty, Property, bind
+from arcade.gui.surface import Surface
+from arcade.gui.ui_manager import UIManager
+from arcade.gui.widgets import UIInteractiveWidget, UIWidget
+from arcade.gui.widgets.layout import UIAnchorLayout
+from arcade.gui.widgets.slider import UIBaseSlider
 
 
 class Focusable(UIWidget):
@@ -59,7 +57,7 @@ def ui(self) -> UIManager | None:
         return None
 
 
-class UIFocusGroup(UIAnchorLayout):
+class UIFocusMixin(UIWidget):
     """A group of widgets that can be focused.
 
     UIFocusGroup maintains two lists of widgets:
@@ -82,8 +80,8 @@ class UIFocusGroup(UIAnchorLayout):
 
     _debug = Property(False)
 
-    def __init__(self, size_hint=(1, 1), **kwargs):
-        super().__init__(size_hint=size_hint, **kwargs)
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
 
         bind(self, "_debug", self.trigger_full_render)
         bind(self, "_focused", self.trigger_full_render)
@@ -253,6 +251,11 @@ def _do_render(self, surface: Surface, force=False) -> bool:
 
     def do_post_render(self, surface: Surface):
         surface.limit(None)
+
+        if self._focused < len(self._focusable_widgets):
+            warnings.warn("Focused widget is out of range")
+            return
+
         widget = self._focusable_widgets[self._focused]
         arcade.draw_rect_outline(
             rect=widget.rect,
@@ -295,3 +298,7 @@ def _draw_indicator(self, start: Vec2, end: Vec2, color=arcade.color.WHITE):
     @staticmethod
     def is_focusable(widget):
         return isinstance(widget, (Focusable, UIInteractiveWidget))
+
+
+class UIFocusGroup(UIFocusMixin, UIAnchorLayout):
+    pass

arcade/gui/experimental/password_input.py

@@ -2,7 +2,9 @@
 
 from typing import Optional
 
-from arcade.gui import Surface, UIEvent, UIInputText, UITextInputEvent
+from arcade.gui.events import UIEvent, UITextInputEvent
+from arcade.gui.surface import Surface
+from arcade.gui.widgets.text import UIInputText
 
 
 class UIPasswordInput(UIInputText):

arcade/gui/experimental/scroll_area.py

@@ -6,20 +6,19 @@
 
 import arcade
 from arcade import XYWH
-from arcade.gui import (
-    Property,
-    Surface,
+from arcade.gui.events import (
     UIEvent,
-    UILayout,
     UIMouseDragEvent,
     UIMouseEvent,
     UIMouseMovementEvent,
     UIMousePressEvent,
     UIMouseReleaseEvent,
     UIMouseScrollEvent,
-    UIWidget,
-    bind,
 )
+from arcade.gui.property import Property, bind
+from arcade.gui.surface import Surface
+from arcade.gui.widgets import UIWidget
+from arcade.gui.widgets.layout import UILayout
 from arcade.types import LBWH