From 8a72e8bf0171fd2cfdf4640ebb9ade68f80ed80e Mon Sep 17 00:00:00 2001 From: Sasha Koshka Date: Thu, 19 Jan 2023 15:05:13 -0500 Subject: [PATCH] Mouse test now conforms to new API --- backends/x/event.go | 2 +- elements/testing/mouse.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backends/x/event.go b/backends/x/event.go index 8e8c1d5..5b71f77 100644 --- a/backends/x/event.go +++ b/backends/x/event.go @@ -122,7 +122,7 @@ func (window *Window) handleButtonPress ( sum := scrollSum { } sum.add(buttonEvent.Detail) window.compressScrollSum(buttonEvent, &sum) - child.HandleScroll ( + child.HandleMouseScroll ( int(buttonEvent.EventX), int(buttonEvent.EventY), float64(sum.x), float64(sum.y)) diff --git a/elements/testing/mouse.go b/elements/testing/mouse.go index 45653aa..df8954f 100644 --- a/elements/testing/mouse.go +++ b/elements/testing/mouse.go @@ -54,7 +54,7 @@ func (element *Mouse) HandleMouseDown (x, y int, button tomo.Button) { func (element *Mouse) HandleMouseUp (x, y int, button tomo.Button) { element.drawing = false mousePos := image.Pt(x, y) - element.core.PushRegion (artist.Line ( + element.core.DamageRegion (artist.Line ( element.core, element.color, 1, element.lastMousePos, mousePos)) element.lastMousePos = mousePos @@ -63,10 +63,10 @@ func (element *Mouse) HandleMouseUp (x, y int, button tomo.Button) { func (element *Mouse) HandleMouseMove (x, y int) { if !element.drawing { return } mousePos := image.Pt(x, y) - element.core.PushRegion (artist.Line ( + element.core.DamageRegion (artist.Line ( element.core, element.color, 1, element.lastMousePos, mousePos)) element.lastMousePos = mousePos } -func (element *Mouse) HandleScroll (x, y int, deltaX, deltaY float64) { } +func (element *Mouse) HandleMouseScroll (x, y int, deltaX, deltaY float64) { }