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

Add tap-to-scroll to the scroll bars #5349

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
+146 −14
Open

Add tap-to-scroll to the scroll bars #5349

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9de088d
add logic for scrollling when tapping the scroll area background
dweymouth Jan 1, 2025
d714713
correct max scroll offset for the bottom/right of the content
dweymouth Jan 1, 2025
6f34467
Add background behind scroll bar when large
dweymouth Jan 2, 2025
f11f183
add new theme ColorNameScrollBarBackground
dweymouth Jan 2, 2025
07ed0cd
fix missing color in test theme
dweymouth Jan 2, 2025
85ed1e9
fix another place of missing color
dweymouth Jan 2, 2025
e67f8d8
update xml render fixtures
dweymouth Jan 2, 2025
fc9ce4d
add unit test for tap-to-scroll
dweymouth Jan 7, 2025
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
Next Next commit
add logic for scrollling when tapping the scroll area background
  • Loading branch information
@dweymouth
dweymouth committed Jan 1, 2025
commit 9de088d440d7db3f7dd513fab4a20497b8ad7f7e
42 changes: 42 additions & 0 deletions internal/widget/scroller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ const (
scrollBarOrientationVertical scrollBarOrientation = 0
scrollBarOrientationHorizontal scrollBarOrientation = 1
scrollContainerMinSize = float32(32) // TODO consider the smallest useful scroll view?

// what fraction of the page to scroll when tapping on the scroll bar area
pageScrollFraction = float32(0.95)
)

type scrollBarRenderer struct {
Expand Down Expand Up @@ -152,8 +155,12 @@ func (r *scrollBarAreaRenderer) Layout(_ fyne.Size) {
switch r.area.orientation {
case scrollBarOrientationHorizontal:
barWidth, barHeight, barX, barY = r.barSizeAndOffset(r.area.scroll.Offset.X, r.area.scroll.Content.Size().Width, r.area.scroll.Size().Width)
r.area.barLeadingEdge = barX
r.area.barTrailingEdge = barX + barWidth
default:
barHeight, barWidth, barY, barX = r.barSizeAndOffset(r.area.scroll.Offset.Y, r.area.scroll.Content.Size().Height, r.area.scroll.Size().Height)
r.area.barLeadingEdge = barY
r.area.barTrailingEdge = barY + barHeight
}
r.bar.Move(fyne.NewPos(barX, barY))
r.bar.Resize(fyne.NewSize(barWidth, barHeight))
Expand Down Expand Up @@ -205,6 +212,7 @@ func (r *scrollBarAreaRenderer) barSizeAndOffset(contentOffset, contentLength, s
}

var _ desktop.Hoverable = (*scrollBarArea)(nil)
var _ fyne.Tappable = (*scrollBarArea)(nil)

type scrollBarArea struct {
Base
Expand All @@ -213,13 +221,47 @@ type scrollBarArea struct {
isMouseIn bool
scroll *Scroll
orientation scrollBarOrientation

// updated from renderer Layout
// coordinates Y in vertical orientation, X in horizontal
barLeadingEdge float32
barTrailingEdge float32
}

func (a *scrollBarArea) CreateRenderer() fyne.WidgetRenderer {
bar := newScrollBar(a)
return &scrollBarAreaRenderer{BaseRenderer: NewBaseRenderer([]fyne.CanvasObject{bar}), area: a, bar: bar}
}

func (a *scrollBarArea) Tapped(e *fyne.PointEvent) {
// when tapping above/below or left/right of the bar, scroll the content
// nearly a full page (pageScrollFraction) up/down or left/right, respectively
newOffset := a.scroll.Offset
switch a.orientation {
case scrollBarOrientationHorizontal:
if e.Position.X < a.barLeadingEdge {
newOffset.X = fyne.Max(0, newOffset.X-a.scroll.Size().Width*pageScrollFraction)
} else if e.Position.X > a.barTrailingEdge {
newOffset.X = fyne.Min(a.scroll.Content.Size().Width, newOffset.X+a.scroll.Size().Width*pageScrollFraction)
}
default:
if e.Position.Y < a.barLeadingEdge {
newOffset.Y = fyne.Max(0, newOffset.Y-a.scroll.Size().Height*pageScrollFraction)
} else if e.Position.Y > a.barTrailingEdge {
newOffset.Y = fyne.Min(a.scroll.Content.Size().Height, newOffset.Y+a.scroll.Size().Height*pageScrollFraction)
}
}
if newOffset == a.scroll.Offset {
return
}

a.scroll.Offset = newOffset
if f := a.scroll.OnScrolled; f != nil {
f(a.scroll.Offset)
}
a.scroll.refreshWithoutOffsetUpdate()
}

func (a *scrollBarArea) MouseIn(*desktop.MouseEvent) {
a.isMouseIn = true
a.scroll.Refresh()
Expand Down
Loading