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

all: avoid collides with builtin min/max functions

Browse Source 
Signed-off-by: Walter Werner SCHNEIDER <contact@schnwalter.eu>
This commit is contained in:
Walter Werner SCHNEIDER
2025-07-14 09:44:44 +03:00
committed by Elias Naur
parent 4e5a344cc2
commit ba82ae46d0
4 changed files with 6 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
io/input/router.go
+6 -6
View File
@@ -628,11 +628,11 @@ func (q *Router) RevealFocus(viewport image.Rectangle) {
viewport = q.pointer.queue.ClipFor(area, viewport)
topleft := bounds.Min.Sub(viewport.Min)
topleft = max(topleft, bounds.Max.Sub(viewport.Max))
topleft = min(image.Pt(0, 0), topleft)
topleft = maxPoint(topleft, bounds.Max.Sub(viewport.Max))
topleft = minPoint(image.Pt(0, 0), topleft)
bottomright := bounds.Max.Sub(viewport.Max)
bottomright = min(bottomright, bounds.Min.Sub(viewport.Min))
bottomright = max(image.Pt(0, 0), bottomright)
bottomright = minPoint(bottomright, bounds.Min.Sub(viewport.Min))
bottomright = maxPoint(image.Pt(0, 0), bottomright)
s := topleft
if s.X == 0 {
s.X = bottomright.X
@@ -659,7 +659,7 @@ func (q *Router) ScrollFocus(dist image.Point) {
}))
}
func max(p1, p2 image.Point) image.Point {
func maxPoint(p1, p2 image.Point) image.Point {
m := p1
if p2.X > m.X {
m.X = p2.X
@@ -670,7 +670,7 @@ func max(p1, p2 image.Point) image.Point {
return m
}
func min(p1, p2 image.Point) image.Point {
func minPoint(p1, p2 image.Point) image.Point {
m := p1
if p2.X < m.X {
m.X = p2.X