Fix some issues with movable dict window (reworked) (#3726)

Clearer rework of this fix (a few commits ago): more explicite,
no need for the additional callback.
This commit is contained in:
poire-z
2018-03-07 15:59:59 +01:00
committed by GitHub
parent e15a1ab1b3
commit 48da3dc750
3 changed files with 44 additions and 50 deletions

View File

@@ -762,7 +762,7 @@ end
local FIND_START = 1
local FIND_END = 2
function TextBoxWidget:onHoldStartText(callback, ges)
function TextBoxWidget:onHoldStartText(_, ges)
-- store hold start position and timestamp, will be used on release
self.hold_start_x = ges.pos.x - self.dimen.x
self.hold_start_y = ges.pos.y - self.dimen.y
@@ -771,16 +771,20 @@ function TextBoxWidget:onHoldStartText(callback, ges)
if self.hold_start_x < 0 or self.hold_start_x > self.dimen.w or
self.hold_start_y < 0 or self.hold_start_y > self.dimen.h then
self.hold_start_tv = nil -- don't process coming HoldRelease event
if callback then
callback(false) -- let know we are not selecting
end
return false -- let event be processed by other widgets
end
self.hold_start_tv = TimeVal.now()
if callback then
callback(true) -- let know we are selecting
return true
end
function TextBoxWidget:onHoldPanText(_, ges)
-- We don't highlight the currently selected text, but just let this
-- event pop up if we are not currently selecting text
if not self.hold_start_tv then
return false
end
-- Don't let that event be processed by other widget
return true
end