skullbite/cartridges
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gamepad: Cleanup MR

Browse Source
This commit is contained in:
Zoey Ahmed
2025-12-29 17:03:23 +00:00
parent 46a30614c3
commit 3c18ae0964
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
cartridges/gamepads.py
View File

@@ -112,10 +112,9 @@ class Gamepad(GObject.Object):
focus_widget.activate() focus_widget.activate()
return return
if self._is_focused_on_sidebar(): if self.window.sidebar.get_focus_child():
self.window.navigate_sidebar( selected_item = self.window.sidebar.get_selected_item()
self.window.sidebar, item=self.window.sidebar.get_selected_item() self.window.navigate_sidebar(self.window.sidebar, item=selected_item)
)
return return
self.window.grid.activate_action( self.window.grid.activate_action(
@@ -148,14 +147,12 @@ class Gamepad(GObject.Object):
# If the grid is not visible (i.e no search results or imports) # If the grid is not visible (i.e no search results or imports)
# the searchbar is focused as a fallback. # the searchbar is focused as a fallback.
elif self._is_focused_on_sidebar(): fallback_child = (
focus_widget = ( self.window.grid
self.window.grid if grid_visible else self.window.search_entry if self.window.sidebar.get_focus_child()
) else self.window.sidebar
else: )
focus_widget = ( focus_widget = fallback_child if grid_visible else self.window.search_entry
self.window.sidebar if grid_visible else self.window.search_entry
)
focus_widget.grab_focus() focus_widget.grab_focus()
self.window.props.focus_visible = True self.window.props.focus_visible = True
@@ -174,7 +171,7 @@ class Gamepad(GObject.Object):
self.window.props.focus_visible = True self.window.props.focus_visible = True
return return
if self._is_focused_on_sidebar(): if self.window.sidebar.get_focus_child():
# The usual behaviour of child_focus() on the sidebar # The usual behaviour of child_focus() on the sidebar
# would result in the + button being focused, instead of the grid # would result in the + button being focused, instead of the grid
# so we need to grab the focus of the grid if the user inputs the # so we need to grab the focus of the grid if the user inputs the
@@ -184,7 +181,9 @@ class Gamepad(GObject.Object):
Gtk.DirectionType.LEFT, Gtk.DirectionType.RIGHT Gtk.DirectionType.LEFT, Gtk.DirectionType.RIGHT
) )
# Focus the first game when re-entering from sidebar
if direction is grid_direction: if direction is grid_direction:
self.window.grid.scroll_to(0, Gtk.ListScrollFlags.FOCUS, None)
self.window.grid.grab_focus() self.window.grid.grab_focus()
return return
@@ -233,7 +232,7 @@ class Gamepad(GObject.Object):
self.window.grid.grab_focus() self.window.grid.grab_focus()
return return
if self._is_focused_on_sidebar(): if self.window.sidebar.get_focus_child():
if self.window.sidebar.child_focus(direction): if self.window.sidebar.child_focus(direction):
self.window.props.focus_visible = True self.window.props.focus_visible = True
return return
@@ -354,9 +353,6 @@ class Gamepad(GObject.Object):
and not self._get_active_menu_button() and not self._get_active_menu_button()
) )
def _is_focused_on_sidebar(self) -> bool:
return bool(self.window.sidebar.get_focus_child())
def _n_grid_games(self) -> int: def _n_grid_games(self) -> int:
return cast(Gtk.SingleSelection, self.window.grid.props.model).props.n_items return cast(Gtk.SingleSelection, self.window.grid.props.model).props.n_items