From dccd0da4ccac04f61c08b9326b1a6a4618375ee8 Mon Sep 17 00:00:00 2001 From: poire-z Date: Sun, 16 Jan 2022 17:31:21 +0100 Subject: [PATCH] Fix hold duration in text/html box widgets Fix very-long-press in DictQuickLookup that should allow doing the query to the other domain (dict/wiki) instead of the current one. Similar to 7dea979. --- frontend/ui/widget/htmlboxwidget.lua | 3 ++- frontend/ui/widget/textboxwidget.lua | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/ui/widget/htmlboxwidget.lua b/frontend/ui/widget/htmlboxwidget.lua index 9eadfd25c..ad15c99f2 100644 --- a/frontend/ui/widget/htmlboxwidget.lua +++ b/frontend/ui/widget/htmlboxwidget.lua @@ -9,6 +9,7 @@ local GestureRange = require("ui/gesturerange") local InputContainer = require("ui/widget/container/inputcontainer") local Mupdf = require("ffi/mupdf") local Screen = Device.screen +local TimeVal = require("ui/timeval") local UIManager = require("ui/uimanager") local logger = require("logger") local util = require("util") @@ -229,7 +230,7 @@ function HtmlBoxWidget:onHoldReleaseText(callback, ges) return false end - local hold_duration = UIManager:getTime() - self.hold_start_tv + local hold_duration = TimeVal.now() - self.hold_start_tv local page = self.document:openPage(self.page_number) local lines = page:getPageText() diff --git a/frontend/ui/widget/textboxwidget.lua b/frontend/ui/widget/textboxwidget.lua index 3bb1e8f1b..324327f9a 100644 --- a/frontend/ui/widget/textboxwidget.lua +++ b/frontend/ui/widget/textboxwidget.lua @@ -24,6 +24,7 @@ local RenderText = require("ui/rendertext") local RightContainer = require("ui/widget/container/rightcontainer") local Size = require("ui/size") local TextWidget = require("ui/widget/textwidget") +local TimeVal = require("ui/timeval") local UIManager = require("ui/uimanager") local Math = require("optmath") local logger = require("logger") @@ -1858,7 +1859,7 @@ function TextBoxWidget:onHoldReleaseText(callback, ges) return false end - local hold_duration = UIManager:getTime() - self.hold_start_tv + local hold_duration = TimeVal.now() - self.hold_start_tv -- If page contains an image, check if Hold is on this image and deal -- with it directly