More mypy fixes

Author: MyreMylar

pygame_gui/core/colour_parser.py

@@ -38,6 +38,7 @@
     Set,
     Dict,
     TypedDict,
+    Any,
 )
 
 import pygame
@@ -478,7 +479,16 @@ def parse_cmy_string(strdata: str) -> pygame.Color:
     """
 
     colour = pygame.Color(0, 0, 0)
-    colour.cmy = parse_colour_model(strdata, "cmy", _colourModelSchemas["cmy"])
+    cmy_output: List[Any] = parse_colour_model(
+        strdata, "cmy", _colourModelSchemas["cmy"]
+    )
+    if (
+        len(cmy_output) == 3
+        and isinstance(cmy_output[0], float)
+        and isinstance(cmy_output[1], float)
+        and isinstance(cmy_output[2], float)
+    ):
+        colour.cmy = tuple(cmy_output)
     return colour
 
 
@@ -510,7 +520,7 @@ def parse_hsl_string(strdata: str) -> pygame.Color:
     """
 
     colour = pygame.Color(0, 0, 0)
-    hsl = parse_colour_model(strdata, "hsl", _colourModelSchemas["hsl"])
+    hsl: List[float] = parse_colour_model(strdata, "hsl", _colourModelSchemas["hsl"])
     colour.hsla = (hsl[0], int(hsl[1] * 100), int(hsl[2] * 100), 100)
     return colour
 
@@ -544,7 +554,7 @@ def parse_hsla_string(strdata: str) -> pygame.Color:
     """
 
     colour = pygame.Color(0, 0, 0)
-    hsla = parse_colour_model(strdata, "hsla", _colourModelSchemas["hsla"])
+    hsla: List[float] = parse_colour_model(strdata, "hsla", _colourModelSchemas["hsla"])
     colour.hsla = (hsla[0], int(hsla[1] * 100), int(hsla[2] * 100), int(hsla[3] * 100))
     return colour
 
@@ -578,7 +588,7 @@ def parse_hsv_string(strdata: str) -> pygame.Color:
     """
 
     colour = pygame.Color(0, 0, 0)
-    hsv = parse_colour_model(strdata, "hsv", _colourModelSchemas["hsv"])
+    hsv: List[float] = parse_colour_model(strdata, "hsv", _colourModelSchemas["hsv"])
     colour.hsva = (hsv[0], int(hsv[1] * 100), int(hsv[2] * 100), 100)
     return colour
 
@@ -597,7 +607,7 @@ def parse_hsva_string(strdata: str) -> pygame.Color:
     """
 
     colour = pygame.Color(0, 0, 0)
-    hsva = parse_colour_model(strdata, "hsva", _colourModelSchemas["hsva"])
+    hsva: List[float] = parse_colour_model(strdata, "hsva", _colourModelSchemas["hsva"])
     colour.hsva = (hsva[0], int(hsva[1] * 100), int(hsva[2] * 100), int(hsva[3] * 100))
     return colour
 
@@ -747,7 +757,7 @@ def get_commas_outside_enclosing_glyphs(strdata: str) -> List[int]:
 
     glyphs: Dict[str, str] = {")": "(", "]": "[", "}": "{"}
 
-    opening_stack = []
+    opening_stack: List[str] = []
     comma_indices_outside_parentheses: List[int] = []
 
     for i, ch in enumerate(strdata):

pygame_gui/core/gui_font_freetype.py

@@ -69,7 +69,7 @@ def underline_adjustment(self, value: float):
         self.__internal_font.underline_adjustment = value
 
     def get_point_size(self) -> int:
-        return self.point_size
+        return int(self.point_size)
 
     def get_rect(self, text: str) -> Rect:
         supposed_rect = self.__internal_font.get_rect(text)

pygame_gui/core/gui_font_pygame.py

@@ -33,17 +33,17 @@ def __init__(
         force_style: bool = False,
         style: Optional[Dict[str, Any]] = None,
     ):
+        self.point_size = int(size)
         self.__internal_font: Font = Font(
-            file, int(size)
+            file, self.point_size
         )  # no resolution option for pygame font?
 
-        self.__internal_font.set_point_size(int(size))
+        self.__internal_font.set_point_size(self.point_size)
         self.pad = True
         self.origin = True
         self.__underline = False  # pylint: disable=unused-private-member
         self.__underline_adjustment = 0.0
 
-        self.point_size = size
         self.antialiased = True
         self.direction = pygame.DIRECTION_LTR
 

pygame_gui/core/interfaces/__init__.py

@@ -10,6 +10,7 @@
 from pygame_gui.core.interfaces.element_interface import IUIElementInterface
 from pygame_gui.core.interfaces.container_interface import IUIContainerInterface
 from pygame_gui.core.interfaces.container_interface import IContainerLikeInterface
+from pygame_gui.core.interfaces.container_interface import IContainerAndContainerLike
 from pygame_gui.core.interfaces.window_interface import IWindowInterface
 from pygame_gui.core.interfaces.window_stack_interface import IUIWindowStackInterface
 from pygame_gui.core.interfaces.tool_tip_interface import IUITooltipInterface
@@ -26,6 +27,7 @@
     "IUIElementInterface",
     "IUIContainerInterface",
     "IContainerLikeInterface",
+    "IContainerAndContainerLike",
     "IWindowInterface",
     "IUIWindowStackInterface",
     "IUITooltipInterface",

pygame_gui/core/interfaces/appearance_theme_interface.py

@@ -1,7 +1,7 @@
 import io
 
 from abc import ABCMeta, abstractmethod
-from typing import List, Union, Dict, Any
+from typing import Optional, List, Union, Dict, Any
 from os import PathLike
 
 
@@ -134,7 +134,7 @@ def get_misc_data(
 
     @abstractmethod
     def get_colour(
-        self, colour_id: str, combined_element_ids: List[str] = None
+        self, colour_id: str, combined_element_ids: Optional[List[str]] = None
     ) -> pygame.Color:
         """
         Uses data about a UI element and a specific ID to find a colour from our theme.
@@ -147,7 +147,7 @@ def get_colour(
 
     @abstractmethod
     def get_colour_or_gradient(
-        self, colour_id: str, combined_ids: List[str] = None
+        self, colour_id: str, combined_ids: Optional[List[str]] = None
     ) -> Union[pygame.Color, IColourGradientInterface]:
         """
         Uses data about a UI element and a specific ID to find a colour, or a gradient,

pygame_gui/core/interfaces/container_interface.py

@@ -206,7 +206,7 @@ class IContainerLikeInterface(metaclass=ABCMeta):
     """
 
     @abstractmethod
-    def get_container(self) -> IUIContainerInterface:
+    def get_container(self) -> "IContainerAndContainerLike":
         """
         Gets an actual container from this container-like UI element.
         """
@@ -241,9 +241,18 @@ def __contains__(self, item: IUIElementInterface) -> bool:
         :return bool: Return True if the element is found, False otherwise.
         """
 
+    @abstractmethod
     def are_contents_hovered(self) -> bool:
         """
         Are any of the elements in the container hovered? Used for handling mousewheel events.
 
         :return: True if one of the elements is hovered, False otherwise.
         """
+
+
+class IContainerAndContainerLike(
+    IUIContainerInterface, IContainerLikeInterface, metaclass=ABCMeta
+):
+    """
+    Combination of IUIContainerInterface and IContainerLikeInterface mostly for type checking
+    """

pygame_gui/core/interfaces/element_interface.py

@@ -1,5 +1,5 @@
 from abc import ABCMeta, abstractmethod
-from typing import Union, List, Set, Any, Dict
+from typing import Union, List, Set, Dict, Optional
 
 import pygame
 
@@ -15,6 +15,25 @@ class IUIElementInterface(IGUISpriteInterface, metaclass=ABCMeta):
 
     """
 
+    @property
+    @abstractmethod
+    def is_focused(self) -> bool:
+        """
+        Returns True if we are focusing this element.
+
+        :return: True if focused.
+        """
+
+    @is_focused.setter
+    @abstractmethod
+    def is_focused(self, value: bool):
+        """
+        Setter for if we are focusing this element.
+
+        :param value: the focus value to set.
+        :return:
+        """
+
     @property
     @abstractmethod
     def hovered(self) -> bool:
@@ -35,7 +54,7 @@ def hovered(self, value: bool):
         """
 
     @abstractmethod
-    def get_relative_rect(self) -> pygame.Rect:
+    def get_relative_rect(self) -> pygame.Rect | pygame.FRect:
         """
         The relative positioning rect.
 
@@ -44,7 +63,7 @@ def get_relative_rect(self) -> pygame.Rect:
         """
 
     @abstractmethod
-    def get_abs_rect(self) -> pygame.Rect:
+    def get_abs_rect(self) -> pygame.Rect | pygame.FRect:
         """
         The absolute positioning rect.
 
@@ -53,7 +72,7 @@ def get_abs_rect(self) -> pygame.Rect:
         """
 
     @abstractmethod
-    def get_element_base_ids(self) -> List[str]:
+    def get_element_base_ids(self) -> List[str | None]:
         """
         A list of all the element base IDs in this element's theming/event hierarchy.
 
@@ -69,23 +88,23 @@ def get_element_ids(self) -> List[str]:
         """
 
     @abstractmethod
-    def get_class_ids(self) -> List[str]:
+    def get_class_ids(self) -> List[str | None]:
         """
         A list of all the class IDs in this element's theming/event hierarchy.
 
         :return: a list of strings, one for each element in the hierarchy.
         """
 
     @abstractmethod
-    def get_object_ids(self) -> List[str]:
+    def get_object_ids(self) -> List[str | None]:
         """
         A list of all the object IDs in this element's theming/event hierarchy.
 
         :return: a list of strings, one for each element in the hierarchy.
         """
 
     @abstractmethod
-    def get_anchors(self) -> Dict[str, Union[str, "IUIElementInterface"]]:
+    def get_anchors(self) -> Optional[Dict[str, Union[str, "IUIElementInterface"]]]:
         """
         A dictionary containing all the anchors defining what the relative rect is relative to
 
@@ -94,7 +113,7 @@ def get_anchors(self) -> Dict[str, Union[str, "IUIElementInterface"]]:
 
     @abstractmethod
     def set_anchors(
-        self, anchors: Union[Dict[str, Union[str, "IUIElementInterface"]], None]
+        self, anchors: Optional[Dict[str, Union[str, "IUIElementInterface"]]]
     ) -> None:
         """
         Wraps the setting of the anchors with some validation
@@ -342,13 +361,13 @@ def get_starting_height(self) -> int:
         """
 
     @abstractmethod
-    def get_focus_set(self) -> Set[Any]:
+    def get_focus_set(self) -> Optional[Set["IUIElementInterface"]]:
         """
         Return the set of elements to focus when we focus this element.
         """
 
     @abstractmethod
-    def set_focus_set(self, focus_set: Set[Any]):
+    def set_focus_set(self, focus_set: Optional[Set["IUIElementInterface"]]):
         """
         Set the focus set to a specific set of elements.
 

pygame_gui/core/interfaces/font_dictionary_interface.py

@@ -1,4 +1,5 @@
 from abc import ABCMeta, abstractmethod
+from typing import Optional
 from pygame import DIRECTION_LTR
 from pygame_gui.core.interfaces.gui_font_interface import IGUIFontInterface
 
@@ -108,9 +109,9 @@ def add_font_path(
         self,
         font_name: str,
         font_path: str,
-        bold_path: str = None,
-        italic_path: str = None,
-        bold_italic_path: str = None,
+        bold_path: Optional[str] = None,
+        italic_path: Optional[str] = None,
+        bold_italic_path: Optional[str] = None,
     ):
         """
         Adds paths to different font files for a font name.

pygame_gui/core/interfaces/manager_interface.py

@@ -7,7 +7,7 @@
     IUIAppearanceThemeInterface,
 )
 from pygame_gui.core.interfaces.element_interface import IUIElementInterface
-from pygame_gui.core.interfaces.container_interface import IUIContainerInterface
+from pygame_gui.core.interfaces.container_interface import IContainerAndContainerLike
 from pygame_gui.core.interfaces.window_stack_interface import IUIWindowStackInterface
 from pygame_gui.core.interfaces.tool_tip_interface import IUITooltipInterface
 from pygame_gui.core.object_id import ObjectID
@@ -34,7 +34,7 @@ def get_double_click_time(self) -> float:
         """
 
     @abstractmethod
-    def get_root_container(self) -> IUIContainerInterface:
+    def get_root_container(self) -> IContainerAndContainerLike:
         """
         Returns the 'root' container. The one all UI elements are placed in by default if they are
         not placed anywhere else, fills the whole OS/pygame window.
@@ -148,9 +148,9 @@ def add_font_paths(
         self,
         font_name: str,
         regular_path: str,
-        bold_path: str = None,
-        italic_path: str = None,
-        bold_italic_path: str = None,
+        bold_path: Optional[str] = None,
+        italic_path: Optional[str] = None,
+        bold_italic_path: Optional[str] = None,
     ):
         """
         Add file paths for custom fonts you want to use in the UI.
@@ -218,12 +218,7 @@ def print_layer_debug(self):
         """
 
     @abstractmethod
-    def set_active_cursor(
-        self,
-        cursor: Tuple[
-            Tuple[int, int], Tuple[int, int], Tuple[int, ...], Tuple[int, ...]
-        ],
-    ):
+    def set_active_cursor(self, cursor: pygame.cursors.Cursor):
         """
         This is for users of the library to set the currently active cursor, it will be currently
         only be overridden by the resizing cursors.

pygame_gui/core/interfaces/window_interface.py

@@ -211,6 +211,7 @@ def set_display_title(self, new_title: str):
         :param new_title: The title to set.
         """
 
+    @abstractmethod
     def get_layer_thickness(self) -> int:
         """
         The layer 'thickness' of this window/

pygame_gui/core/interfaces/window_stack_interface.py

@@ -57,6 +57,7 @@ def is_window_at_top(self, window: IWindowInterface) -> bool:
 
         """
 
+    @abstractmethod
     def is_window_at_top_of_top(self, window: IWindowInterface) -> bool:
         """
         Checks if a window is at the top of the top window stack or not.

pygame_gui/core/object_id.py

@@ -1,5 +1,3 @@
 from collections import namedtuple
 
-ObjectID = namedtuple(
-    "ObjectID", ("object_id", "class_id"), defaults=(None, None)
-)
+ObjectID = namedtuple("ObjectID", ("object_id", "class_id"), defaults=(None, None))

pygame_gui/core/package_resource.py

@@ -14,7 +14,7 @@ def _create_resource_path(relative_path: Union[str, Path]):
 
     try:
         # PyInstaller creates a temp folder and stores path in _MEIPASS
-        if getattr(sys, 'frozen', False):
+        if getattr(sys, "frozen", False):
             base_path = sys._MEIPASS  # type: ignore # pylint: disable=no-member,protected-access
         else:
             base_path = os.path.abspath(".")