renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix closing dict window will bookmark current page

Browse Source 
use `self.highlight:handleEvent(Event:new("Tap"))` instead of
`self.ui:handleEvent(Event:new("Tap"))` when clearing highlighted
text since Tap event in latter situation will be captured by
the dogear widget.
This commit is contained in:
chrox
2013-12-20 12:05:07 +08:00
parent 648b4f33ec
commit e5bf0eb13e
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/ui/reader/readerdictionary.lua
View File

@@ -7,7 +7,8 @@ local DEBUG = require("dbg")
local ReaderDictionary = EventListener:new{}
function ReaderDictionary:onLookupWord(word)
function ReaderDictionary:onLookupWord(highlight, word)
self.highlight = highlight
self:stardictLookup(word)
end
@@ -36,6 +37,7 @@ function ReaderDictionary:showDict(results)
DEBUG("showing quick lookup dictionary window")
UIManager:show(DictQuickLookup:new{
ui = self.ui,
highlight = self.highlight,
dialog = self.dialog,
results = results,
dictionary = self.default_dictionary,

8
frontend/ui/reader/readerhighlight.lua
View File

@@ -225,23 +225,23 @@ end
function ReaderHighlight:lookup(selected_word)
-- if we extracted text directly
if selected_word.word then
self.ui:handleEvent(Event:new("LookupWord", selected_word.word))
self.ui:handleEvent(Event:new("LookupWord", self, selected_word.word))
-- or we will do OCR
else
local word = self.ui.document:getOCRWord(self.hold_pos.page, selected_word)
DEBUG("OCRed word:", word)
self.ui:handleEvent(Event:new("LookupWord", word))
self.ui:handleEvent(Event:new("LookupWord", self, word))
end
end
function ReaderHighlight:translate(selected_text)
if selected_text.text ~= "" then
self.ui:handleEvent(Event:new("TranslateText", selected_text.text))
self.ui:handleEvent(Event:new("TranslateText", self, selected_text.text))
-- or we will do OCR
else
local text = self.ui.document:getOCRText(self.hold_pos.page, selected_text)
DEBUG("OCRed text:", text)
self.ui:handleEvent(Event:new("TranslateText", text))
self.ui:handleEvent(Event:new("TranslateText", self, text))
end
end

2
frontend/ui/widget/dictquicklookup.lua
View File

@@ -268,7 +268,7 @@ end
function DictQuickLookup:onTapCloseDict(arg, ges_ev)
if ges_ev.pos:notIntersectWith(self.dict_frame.dimen) then
UIManager:close(self)
self.ui:handleEvent(Event:new("Tap"))
self.highlight:handleEvent(Event:new("Tap"))
return true
elseif not ges_ev.pos:notIntersectWith(self.dict_title.dimen) then
self.ui:handleEvent(Event:new("UpdateDefaultDict", self.dictionary))