joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-05 17:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui: rename Config.Val to Pixels

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-07-10 13:59:09 +02:00
parent e3ba84758c
commit 320579814f
8 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/gesture/gestures.go
+4 -4
View File
@@ -165,9 +165,9 @@ func (s *Scroll) Scroll(cfg *ui.Config, q input.Events, axis Axis) int {
break
}
fling := s.estimator.Estimate()
if slop, d := float32(cfg.Val(touchSlop)), fling.Distance; d >= slop || -slop >= d {
if min, v := float32(cfg.Val(minFlingVelocity)), fling.Velocity; v >= min || -min >= v {
max := float32(cfg.Val(maxFlingVelocity))
if slop, d := float32(cfg.Pixels(touchSlop)), fling.Distance; d >= slop || -slop >= d {
if min, v := float32(cfg.Pixels(minFlingVelocity)), fling.Velocity; v >= min || -min >= v {
max := float32(cfg.Pixels(maxFlingVelocity))
if v > max {
v = max
} else if v < -max {
@@ -200,7 +200,7 @@ func (s *Scroll) Scroll(cfg *ui.Config, q input.Events, axis Axis) int {
v := int(math.Round(float64(val)))
dist := s.last - v
if e.Priority < pointer.Grabbed {
slop := cfg.Val(touchSlop)
slop := cfg.Pixels(touchSlop)
if dist := dist; dist >= slop || -slop >= dist {
s.grab = true
}