Merge pull request #404 from chrox/master

fix closing dict window will bookmark current page

frontend/ui/reader/readerdictionary.lua

@@ -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,

frontend/ui/reader/readerhighlight.lua

@@ -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
 
@@ -259,7 +259,7 @@ function ReaderHighlight:onHoldRelease(arg, ges)
 						callback = function()
 							self:saveHighlight()
 							UIManager:close(self.highlight_dialog)
-							self.ui:handleEvent(Event:new("Tap"))
+							self:handleEvent(Event:new("Tap"))
 						end,
 					},
 					{
@@ -268,7 +268,7 @@ function ReaderHighlight:onHoldRelease(arg, ges)
 						callback = function()
 							self:addNote()
 							UIManager:close(self.highlight_dialog)
-							self.ui:handleEvent(Event:new("Tap"))
+							self:handleEvent(Event:new("Tap"))
 						end,
 					},
 				},
@@ -278,7 +278,7 @@ function ReaderHighlight:onHoldRelease(arg, ges)
 						callback = function()
 							self:translate(self.selected_text)
 							UIManager:close(self.highlight_dialog)
-							self.ui:handleEvent(Event:new("Tap"))
+							self:handleEvent(Event:new("Tap"))
 						end,
 					},
 					{
@@ -287,7 +287,7 @@ function ReaderHighlight:onHoldRelease(arg, ges)
 						callback = function()
 							self:shareHighlight()
 							UIManager:close(self.highlight_dialog)
-							self.ui:handleEvent(Event:new("Tap"))
+							self:handleEvent(Event:new("Tap"))
 						end,
 					},
 				},
@@ -298,12 +298,12 @@ function ReaderHighlight:onHoldRelease(arg, ges)
 						callback = function()
 							self:moreAction()
 							UIManager:close(self.highlight_dialog)
-							self.ui:handleEvent(Event:new("Tap"))
+							self:handleEvent(Event:new("Tap"))
 						end,
 					},
 				},
 			},
-			tap_close_callback = function() self.ui:handleEvent(Event:new("Tap")) end,
+			tap_close_callback = function() self:handleEvent(Event:new("Tap")) end,
 		}
 		UIManager:show(self.highlight_dialog)
 	end

frontend/ui/widget/dictquicklookup.lua

@@ -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))