From 1e675a2e3523411b45655e450be62b137f41230a Mon Sep 17 00:00:00 2001 From: "kepler155c@gmail.com" Date: Sun, 1 Dec 2019 13:25:26 -0700 Subject: [PATCH] revert multiple sub-canvas mouse click --- sys/modules/opus/ui/components/Page.lua | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sys/modules/opus/ui/components/Page.lua b/sys/modules/opus/ui/components/Page.lua index 7fbaa0f..7bc8e70 100644 --- a/sys/modules/opus/ui/components/Page.lua +++ b/sys/modules/opus/ui/components/Page.lua @@ -73,12 +73,17 @@ function UI.Page:pointToChild(x, y) if self.__target == self then return UI.Window.pointToChild(self, x, y) end + x = x + self.offx - self.x + 1 + y = y + self.offy - self.y + 1 +--[[ + -- this is supposed to fix when there are multiple sub canvases local absX, absY = getPosition(self.__target) - - -- this is sketchy - x = x + self.offx - self.x - (absX - self.__target.x) + 1 - y = y + self.offy - self.y - (absY - self.__target.y) + 1 - + if self.__target.canvas then + x = x - (self.__target.canvas.x - self.__target.x) + y = y - (self.__target.canvas.y - self.__target.y) + _syslog({'raw', self.__target.canvas.y, self.__target.y}) + end + ]] return self.__target:pointToChild(x, y) end