Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use Talon screen ordering #1502

Merged
merged 1 commit into from
Jul 21, 2024
Merged

Use Talon screen ordering #1502

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions core/screens/screens.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
class Actions:
def screens_show_numbering():
"""Show screen number on each screen"""
screens = get_sorted_screens()
screens = ui.screens()
number = 1
for screen in screens:
show_screen_number(screen, number)
number += 1

def screens_get_by_number(screen_number: int) -> ui.Screen:
"""Get screen by number"""
screens = get_sorted_screens()
screens = ui.screens()
length = len(screens)
if screen_number < 1 or screen_number > length:
raise Exception(
Expand All @@ -34,21 +34,11 @@ def screens_get_next(screen: ui.Screen) -> ui.Screen:


def get_screen_by_offset(screen: ui.Screen, offset: int) -> ui.Screen:
screens = get_sorted_screens()
screens = ui.screens()
index = (screens.index(screen) + offset) % len(screens)
return screens[index]


def get_sorted_screens():
"""Return screens sorted by their topmost, then leftmost, edge.
Screens will be sorted leftto-right, then top-to-bottom as a tiebreak.
"""
return sorted(
ui.screens(),
key=lambda screen: screen.visible_rect.left,
)


def show_screen_number(screen: ui.Screen, number: int):
def on_draw(c):
c.paint.typeface = "arial"
Expand Down