Even More mypy fixes

Author: MyreMylar

pygame_gui/core/drawable_shapes/drawable_shape.py

@@ -1,7 +1,7 @@
 import math
 
 from collections import deque
-from typing import Dict, List, Union, Tuple, Optional
+from typing import Dict, List, Union, Tuple, Optional, Deque
 
 import pygame
 
@@ -247,7 +247,7 @@ def __init__(
         self.ui_manager = manager
         self.shape_cache = self.ui_manager.get_theme().shape_cache
 
-        self.states_to_redraw_queue = deque([])
+        self.states_to_redraw_queue: Deque[str] = deque([])
         self.need_to_clean_up = True
 
         self.should_trigger_full_rebuild = True
@@ -772,29 +772,27 @@ def finalise_text(
                 flags=pygame.SRCALPHA,
                 depth=32,
             )
-            self.states[state_str].text_surface.fill("#00000000")
+            text_surface = self.states[state_str].text_surface
+            if text_surface is not None:
+                text_surface.fill("#00000000")
+
+                if only_text_changed:
+                    self.text_box_layout.blit_finalised_text_to_surf(text_surface)
+                else:
+                    self.text_box_layout.set_default_text_colour(
+                        self.theming[text_colour_state_str]
+                    )
+                    self.text_box_layout.set_default_text_shadow_colour(
+                        self.theming[text_shadow_colour_state_str]
+                    )
+                    self.text_box_layout.finalise_to_surf(text_surface)
 
-            if only_text_changed:
-                self.text_box_layout.blit_finalised_text_to_surf(
-                    self.states[state_str].text_surface
-                )
-            else:
-                self.text_box_layout.set_default_text_colour(
-                    self.theming[text_colour_state_str]
-                )
-                self.text_box_layout.set_default_text_shadow_colour(
-                    self.theming[text_shadow_colour_state_str]
-                )
-                self.text_box_layout.finalise_to_surf(
-                    self.states[state_str].text_surface
+                basic_blit(
+                    self.states[state_str].surface,
+                    text_surface,
+                    (0, 0),
                 )
 
-            basic_blit(
-                self.states[state_str].surface,
-                self.states[state_str].text_surface,
-                (0, 0),
-            )
-
     def apply_active_text_changes(self):
         """
         Updates the shape surface with any changes to the text surface. Useful when we've made
@@ -832,14 +830,15 @@ def set_text_alpha(self, alpha: int):
 
         :param alpha: the alpha to set.
         """
-        self.text_box_layout.set_alpha(alpha)
-        self.redraw_state(self.active_state.state_id, add_text=False)
-        self.finalise_text(
-            self.active_state.state_id,
-            f"{self.active_state.state_id}_text",
-            f"{self.active_state.state_id}_text_shadow",
-            only_text_changed=False,
-        )
+        if self.text_box_layout is not None:
+            self.text_box_layout.set_alpha(alpha)
+            self.redraw_state(self.active_state.state_id, add_text=False)
+            self.finalise_text(
+                self.active_state.state_id,
+                f"{self.active_state.state_id}_text",
+                f"{self.active_state.state_id}_text_shadow",
+                only_text_changed=False,
+            )
 
     def redraw_active_state_no_text(self):
         """
@@ -877,7 +876,8 @@ def insert_text(
             + text
             + self.theming["text"][layout_index:]
         )
-        self.text_box_layout.insert_text(text, layout_index, parser)
+        if self.text_box_layout is not None:
+            self.text_box_layout.insert_text(text, layout_index, parser)
 
     def toggle_text_cursor(self):
         """

pygame_gui/core/drawable_shapes/ellipse_drawable_shape.py

@@ -217,7 +217,8 @@ def redraw_state(self, state_str: str, add_text: bool = True):
             if found_shape is not None:
                 self.states[state_str].surface = found_shape.copy()
             else:
-                self.states[state_str].surface = self.base_surface.copy()
+                if self.base_surface is not None:
+                    self.states[state_str].surface = self.base_surface.copy()
 
                 # Try one AA call method
                 aa_amount = 4

pygame_gui/core/drawable_shapes/rect_drawable_shape.py

@@ -222,7 +222,8 @@ def redraw_state(self, state_str: str, add_text: bool = True):
             if found_shape is not None:
                 self.states[state_str].surface = found_shape.copy()
             else:
-                self.states[state_str].surface = self.base_surface.copy()
+                if self.base_surface is not None:
+                    self.states[state_str].surface = self.base_surface.copy()
 
                 if self.border_width > 0:
                     if isinstance(
@@ -308,10 +309,9 @@ def redraw_state(self, state_str: str, add_text: bool = True):
                             self.theming["filled_bar"], bar_rect
                         )
 
-                if self.states[state_str].cached_background_id is not None:
-                    self.shape_cache.remove_user_from_cache_item(
-                        self.states[state_str].cached_background_id
-                    )
+                cached_id = self.states[state_str].cached_background_id
+                if cached_id is not None:
+                    self.shape_cache.remove_user_from_cache_item(cached_id)
                 if (
                     not self.has_been_resized
                     and (

pygame_gui/core/drawable_shapes/rounded_rect_drawable_shape.py

@@ -514,8 +514,8 @@ def redraw_state(self, state_str: str, add_text: bool = True):
 
                 basic_blit(self.states[state_str].surface, bab_surface, (0, 0))
 
-                if self.states[state_str].cached_background_id is not None:
-                    cached_id = self.states[state_str].cached_background_id
+                cached_id = self.states[state_str].cached_background_id
+                if cached_id is not None:
                     self.shape_cache.remove_user_from_cache_item(cached_id)
                 if (
                     not self.has_been_resized

pygame_gui/core/gui_type_hints.py

@@ -6,7 +6,12 @@
 RectLike = Union[Rect, FRect, Tuple[float, float, float, float]]
 
 
-class SpriteWithHealth(Protocol):
+class WithHealth(Protocol):
+    current_health: int
+    health_capacity: int
+
+
+class SpriteWithHealth(WithHealth):
     """
     A protocol for sprites that have health. This protocol defines the required attributes for
     sprites that have health, including current health, health capacity, rect, and image.

pygame_gui/core/interfaces/appearance_theme_interface.py

@@ -15,6 +15,8 @@
 )
 from pygame_gui.core.interfaces.gui_font_interface import IGUIFontInterface
 from pygame_gui.core.package_resource import PackageResource
+from pygame_gui.core.surface_cache import SurfaceCache
+from pygame_gui.core.ui_shadow import ShadowGenerator
 
 
 class IUIAppearanceThemeInterface(metaclass=ABCMeta):
@@ -190,3 +192,44 @@ def update_single_element_theming(self, element_name: str, new_theming_data: str
         :param new_theming_data:
         :return:
         """
+
+    @property
+    @abstractmethod
+    def shape_cache(self) -> SurfaceCache:
+        """
+
+        :return:
+        """
+
+    @shape_cache.setter
+    @abstractmethod
+    def shape_cache(self, new_cache: SurfaceCache):
+        """
+
+        :param new_cache:
+        :return:
+        """
+
+    @abstractmethod
+    def check_need_to_rebuild_data_manually_changed(self) -> bool:
+        """
+        Checks and resets a flag for whether we need to trigger a rebuild of all the UI elements after a manual
+        change in the data.
+
+        :return: A boolean that indicates whether we should rebuild or not.
+        """
+
+    @abstractmethod
+    def set_locale(self, locale: str):
+        """
+        Set the locale used in the appearance theme.
+
+        :param locale: a two-letter ISO country code.
+        """
+
+    @abstractmethod
+    def get_shadow_generator(self) -> ShadowGenerator:
+        """
+
+        :return:
+        """

pygame_gui/core/interfaces/container_interface.py

@@ -120,7 +120,7 @@ def get_thickness(self) -> int:
         """
 
     @abstractmethod
-    def get_size(self) -> Tuple[int, int]:
+    def get_size(self) -> Tuple[int, int] | Tuple[float, float]:
         """
         Get the container's pixel size.
 

pygame_gui/core/interfaces/font_dictionary_interface.py

@@ -53,6 +53,15 @@ def get_default_font(self) -> IGUIFontInterface:
 
         """
 
+    @abstractmethod
+    def get_default_symbol_font(self) -> IGUIFontInterface:
+        """
+        Grab the default symbol font.
+
+        :return: The default symbol font.
+
+        """
+
     @abstractmethod
     def create_font_id(
         self,

pygame_gui/core/interfaces/manager_interface.py

@@ -34,7 +34,7 @@ def get_double_click_time(self) -> float:
         """
 
     @abstractmethod
-    def get_root_container(self) -> IContainerAndContainerLike:
+    def get_root_container(self) -> Optional[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.
@@ -248,7 +248,7 @@ def create_tool_tip(
         position: Tuple[int, int],
         hover_distance: Tuple[int, int],
         parent_element: IUIElementInterface,
-        object_id: ObjectID,
+        object_id: Optional[ObjectID],
         *,
         wrap_width: Optional[int] = None,
         text_kwargs: Optional[Dict[str, str]] = None,