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

cre: properly unmark link position markers (#5451)

Browse Source 
By restoring the previous content instead of just drawing
a white rectangle.
This commit is contained in:
poire-z
2019-10-04 23:04:58 +02:00
committed by GitHub
parent 63e80c7bb7
commit 529d2d91d6
1 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
frontend/apps/reader/modules/readerrolling.lua
View File

@@ -604,18 +604,41 @@ function ReaderRolling:onGotoXPointer(xp, marker_xp)
self.mark_func = function()
self.mark_func = nil
local delayed_unmark = type(marker_setting) == "number"
if delayed_unmark then -- we'll have to remove the marker
-- We remember the original content that was where we are going
-- to draw the marker.
-- It's usually some white margin, so we could just draw a white
-- rectangle to unmark it; but it might not always be just white
-- margin: when we're in dual page mode and crengine has drawn a
-- vertical pages separator - or if we have had crengine draw
-- some backgroud texture with credocument:setBackgroundImage().
if self.mark_orig_content_bb then
-- be sure we don't leak memory if a previous one is still
-- hanging around
self.mark_orig_content_bb:free()
self.mark_orig_content_bb = nil
end
self.mark_orig_content_bb = Blitbuffer.new(marker_w, marker_h, Screen.bb:getType())
self.mark_orig_content_bb:blitFrom(Screen.bb, 0, 0, screen_x, screen_y, marker_w, marker_h)
end
-- Paint directly to the screen and force a regional refresh
Screen.bb:paintRect(screen_x, screen_y, marker_w, marker_h, Blitbuffer.COLOR_BLACK)
Screen["refreshFast"](Screen, screen_x, screen_y, marker_w, marker_h)
if type(marker_setting) == "number" then -- hide it
if delayed_unmark then
self.unmark_func = function()
self.unmark_func = nil
-- UIManager:setDirty(self.view.dialog, "ui", Geom:new({x=0, y=screen_y, w=marker_w, h=marker_h}))
-- No need to use setDirty (which would ask crengine to
-- re-render the page, which may take a few seconds on big
-- documents): we drew our black marker in the margin, we
-- can just draw a white one to make it disappear
Screen.bb:paintRect(screen_x, screen_y, marker_w, marker_h, Blitbuffer.COLOR_WHITE)
Screen["refreshUI"](Screen, screen_x, screen_y, marker_w, marker_h)
-- documents). We just restore what was there by painting
-- it directly to screen and triggering a regional refresh.
if self.mark_orig_content_bb then
Screen.bb:blitFrom(self.mark_orig_content_bb, screen_x, screen_y, 0, 0, marker_w, marker_h)
Screen["refreshUI"](Screen, screen_x, screen_y, marker_w, marker_h)
self.mark_orig_content_bb:free()
self.mark_orig_content_bb = nil
end
end
UIManager:scheduleIn(marker_setting, self.unmark_func)
end