Skip to content

gui: fix scrolling for small content #2491

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

Merged
eruvanos merged 1 commit into from
Jan 12, 2025
Merged

gui: fix scrolling for small content #2491

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
12 changes: 10 additions & 2 deletions arcade/gui/experimental/scroll_area.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,10 @@ def _thumb_rect(self):
else scroll_area.surface.width - scroll_area.content_width
)

if scroll_range <= 0:
# content is smaller than the scroll area, no need for a thumb
return XYWH(0, 0, 0, 0)

scroll_progress = -scroll_value / scroll_range

content_size = self.content_height if self.vertical else self.content_width
Expand Down Expand Up @@ -319,13 +323,17 @@ def on_event(self, event: UIEvent) -> Optional[bool]:
# clip scrolling to canvas size
if not self.overscroll_x:
# clip scroll_x between 0 and -(self.surface.width - self.width)
scroll_range = int(self.content_width - self.surface.width)
scroll_range = min(0, scroll_range) # clip to 0 if content is smaller than surface
self.scroll_x = min(0, self.scroll_x)
self.scroll_x = max(self.scroll_x, -int(self.surface.width - self.content_width))
self.scroll_x = max(self.scroll_x, scroll_range)

if not self.overscroll_y:
# clip scroll_y between 0 and -(self.surface.height - self.height)
scroll_range = int(self.content_height - self.surface.height)
scroll_range = min(0, scroll_range) # clip to 0 if content is smaller than surface
self.scroll_y = min(0, self.scroll_y)
self.scroll_y = max(self.scroll_y, -int(self.surface.height - self.content_height))
self.scroll_y = max(self.scroll_y, scroll_range)

return True

Expand Down
Loading