Merge pull request #525 from JaskRendix/fix-code-ql

Fix CodeQL findings and some typehints

Author: ppizarror

pygame_menu/widgets/core/widget.py

@@ -362,7 +362,6 @@ class Widget(Base):
     ]
     configured: bool
     force_menu_draw_focus: bool
-    is_scrollable: bool
     last_surface: pygame.Surface | None
     lock_position: bool
     readonly: bool
@@ -380,12 +379,18 @@ def __init__(
         args=None,
         kwargs=None,
         *,
+        active: bool = False,
+        accept_events: bool = False,
+        scrollable: bool = False,
         selectable: bool = True,
+        selection_effect_draw_post: bool = True,
         visible: bool = True,
     ) -> None:
         super().__init__(object_id=widget_id)
 
-        self._accept_events = False  # Indicate the widget receives events (info)
+        self._accept_events = (
+            accept_events  # Indicate the widget receives events (info)
+        )
         self._alignment = ALIGN_CENTER  # Widget alignment
         self._background_color = None
         self._background_inflate = (0, 0)
@@ -506,7 +511,7 @@ def __init__(
         # NullSelection was created. Initially it was None
         self._selection_effect = pygame_menu.widgets.NoneSelection()
         # If False, the selection effect is drawn previous the widget surface
-        self._selection_effect_draw_post = True
+        self._selection_effect_draw_post = selection_effect_draw_post
 
         # Inputs
         self._ctrl = Controller()
@@ -520,10 +525,12 @@ def __init__(
 
         # Public statutes. These values can be changed without calling for
         # methods (safe to update)
-        self.active = False  # Widget requests focus if selected
+        self.active = active  # Widget requests focus if selected
         self.configured = False  # Widget has been configured
         self.force_menu_draw_focus = False  # If True Menu draw focus if widget is selected, don't consider the previous requisites
-        self.is_scrollable = False  # Some widgets can be scrolled, such as the Frame
+        self.is_scrollable = (
+            scrollable  # Some widgets can be scrolled, such as the Frame
+        )
         self.is_selectable = selectable  # Some widgets cannot be selected like labels
         self.last_surface = None  # Stores the last surface the widget has been drawn
         self.lock_position = False  # If True, the widget don't update the position if .set_position() is executed

pygame_menu/widgets/widget/button.py

@@ -62,8 +62,7 @@ def __init__(
         *args,
         **kwargs,
     ) -> None:
-        super().__init__(title=title, label_id=button_id)
-        self._accept_events = True
+        super().__init__(title=title, label_id=button_id, accept_events=True)
         self._args = list(args)
         self._kwargs = kwargs
         self.set_onreturn(onreturn)

pygame_menu/widgets/widget/dropselect.py

@@ -139,7 +139,6 @@ class DropSelect(Widget):
     :param kwargs: Optional keyword arguments
     """
 
-    _close_on_apply: bool
     _drop_frame: Frame | None
     _index: int
     _items: list[tuple[Any, ...]] | list[str]
@@ -187,6 +186,7 @@ def __init__(
         self,
         title: Any,
         items: list[tuple[Any, ...]] | list[str],
+        close_on_apply: bool = True,
         dropselect_id: str = "",
         default: int | None = None,
         onchange: CallbackType = None,
@@ -312,10 +312,11 @@ def __init__(
             widget_id=dropselect_id,
             args=args,
             kwargs=kwargs,
+            accept_events=True,
+            selection_effect_draw_post=False,
         )
 
-        self._accept_events = True
-        self._close_on_apply = True
+        self._close_on_apply = close_on_apply
         self._default_value = default
         self._drop_frame = None
         self._index = default
@@ -324,7 +325,6 @@ def __init__(
         self._open_middle = open_middle
         self._placeholder = placeholder
         self._placeholder_add_to_selection_box = placeholder_add_to_selection_box
-        self._selection_effect_draw_post = False
         self._title_size = (0, 0)
 
         # If True adds a space equals to the height of the option at left, used for
@@ -375,8 +375,6 @@ def __init__(
             "size": selection_option_font_size,
         }
 
-        self.active = False
-
     def set_default_value(self, index: int) -> DropSelect:
         self._default_value = index
         return self

pygame_menu/widgets/widget/dropselect_multiple.py

@@ -202,6 +202,7 @@ def __init__(
         super().__init__(
             dropselect_id=dropselect_id,
             items=items,
+            close_on_apply=False,
             onchange=onchange,
             onreturn=onreturn,
             onselect=onselect,
@@ -261,7 +262,6 @@ def __init__(
 
         # Configure parent
         self._args = args or []
-        self._close_on_apply = False
         self._max_selected = max_selected
         self._selection_option_left_space_margin = selection_option_selected_box_margin
 

pygame_menu/widgets/widget/frame.py

@@ -200,7 +200,6 @@ def __init__(
         # Configure widget public's
         self.first_index = -1
         self.horizontal = orientation == ORIENTATION_HORIZONTAL
-        self.is_scrollable = False
         self.last_index = -1
 
     def set_title(

pygame_menu/widgets/widget/label.py

@@ -65,11 +65,17 @@ def __init__(
         wordwrap: bool = False,
         leading: int | None = None,
         max_nlines: int | None = None,
+        accept_events: bool = False,
     ) -> None:
         assert isinstance(leading, (type(None), int))
         assert isinstance(max_nlines, (type(None), int))
         assert isinstance(wordwrap, bool)
-        super().__init__(title=title, onselect=onselect, widget_id=label_id)
+        super().__init__(
+            title=title,
+            onselect=onselect,
+            widget_id=label_id,
+            accept_events=accept_events,
+        )
         self._last_underline = ["", None]  # deco id, (color, offset, width)
         self._leading = leading
         self._lines = []  # Lines of text displayed

pygame_menu/widgets/widget/scrollbar.py

@@ -125,6 +125,7 @@ def __init__(
             onchange=onchange,
             args=args,
             kwargs=kwargs,
+            scrollable=True,
             selectable=False,
         )
 
@@ -170,7 +171,6 @@ def __init__(
         self.set_orientation(orientation)
 
         # Configure public's
-        self.is_scrollable = True
         self.scrolling = False
 
     def scroll_to_widget(self, *args, **kwargs) -> ScrollBar:

pygame_menu/widgets/widget/selector.py

@@ -188,9 +188,9 @@ def __init__(
             widget_id=selector_id,
             args=args,
             kwargs=kwargs,
+            accept_events=True,
         )
 
-        self._accept_events = True
         self._index = 0
         self._items = items.copy()
         self._sformat = ""

pygame_menu/widgets/widget/textinput.py

@@ -319,6 +319,7 @@ def __init__(
             onselect=onselect,
             title=title,
             widget_id=textinput_id,
+            accept_events=True,
         )
 
         self._input_string = ""
@@ -407,7 +408,6 @@ def __init__(
         self._apply_widget_update_callback = True
 
         # Other
-        self._accept_events = True
         self._alt_x_enabled = True
         self._copy_paste_enabled = copy_paste_enable
         self._current_underline_string = ""

pygame_menu/widgets/widget/toggleswitch.py

@@ -159,6 +159,7 @@ def __init__(
             onselect=onselect,
             title=title,
             widget_id=toggleswitch_id,
+            accept_events=True,
         )
 
         # Asserts
@@ -269,7 +270,6 @@ def __init__(
             self._state_width_accum.append(accum_width)
 
         # Inner properties
-        self._accept_events = True
         self._slider_height = 0
         self._slider_pos = (0, 0)  # to add to (rect.x, rect.y)
         self._state_font = None