jacob.eva/openCom-Companion
1
0
Fork 0
mirror of https://github.com/liberatedsystems/openCom-Companion.git synced 2024-11-21 21:10:36 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved navigation

Browse Source
This commit is contained in:
Mark Qvist 2024-06-01 01:12:10 +02:00
parent e64e3b6627
commit 3bf13d7435
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sbapp/main.py
View File

@ -935,7 +935,10 @@ class SidebandApp(MDApp):
if text == "w": if text == "w":
if self.root.ids.screen_manager.current == "conversations_screen": if self.root.ids.screen_manager.current == "conversations_screen":
self.quit_action(self) if self.include_conversations and not self.include_objects:
self.quit_action(self)
else:
self.conversations_action(direction="right")
elif self.root.ids.screen_manager.current == "map_settings_screen": elif self.root.ids.screen_manager.current == "map_settings_screen":
self.close_sub_map_action() self.close_sub_map_action()
elif self.root.ids.screen_manager.current == "object_details_screen": elif self.root.ids.screen_manager.current == "object_details_screen":
@ -1013,10 +1016,13 @@ class SidebandApp(MDApp):
# Handle escape/back # Handle escape/back
if key == 27: if key == 27:
if self.root.ids.screen_manager.current == "conversations_screen": if self.root.ids.screen_manager.current == "conversations_screen":
if time.time() - self.last_exit_event < 2: if not self.include_conversations and self.include_objects:
self.quit_action(self) self.conversations_action(direction="right")
else: else:
self.last_exit_event = time.time() if time.time() - self.last_exit_event < 2:
self.quit_action(self)
else:
self.last_exit_event = time.time()
else: else:
if self.root.ids.screen_manager.current == "hardware_rnode_screen": if self.root.ids.screen_manager.current == "hardware_rnode_screen":

2
sbapp/ui/layouts.py
View File

@ -62,7 +62,7 @@ MDNavigationLayout:
OneLineIconListItem: OneLineIconListItem:
text: "Objects" text: "Objects & Devices"
on_release: root.ids.screen_manager.app.objects_action(self) on_release: root.ids.screen_manager.app.objects_action(self)
# _no_ripple_effect: True # _no_ripple_effect: True