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

Bookmarks: fix dogear not shown when highlights on same page

Browse Source 
Depending on the random ordering of bookmarks and highlights
on a same page, the binary seach could not notice that a
bookmark exists for this page.
Solve this by putting bookmark before highlights on a same
page in the list, and skip them when searching.
This commit is contained in:
poire-z
2020-02-27 22:03:04 +01:00
parent e6612eefe1
commit 85a06ff995
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
frontend/apps/reader/modules/readerbookmark.lua
View File

@@ -71,19 +71,31 @@ end
function ReaderBookmark:isBookmarkInPageOrder(a, b)
if self.ui.document.info.has_pages then
if a.page == b.page then -- have bookmarks before highlights
return a.highlighted
end
return a.page > b.page
else
return self.ui.document:getPageFromXPointer(a.page) >
self.ui.document:getPageFromXPointer(b.page)
local a_page = self.ui.document:getPageFromXPointer(a.page)
local b_page = self.ui.document:getPageFromXPointer(b.page)
if a_page == b_page then -- have bookmarks before highlights
return a.highlighted
end
return a_page > b_page
end
end
function ReaderBookmark:isBookmarkInReversePageOrder(a, b)
-- The way this is used (by getNextBookmarkedPage(), iterating bookmarks
-- in reverse order), we want to skip highlights, but also the current
-- page: so we do not do any "a.page == b.page" check (not even with
-- a reverse logic than the one from above function).
if self.ui.document.info.has_pages then
return a.page < b.page
else
return self.ui.document:getPageFromXPointer(a.page) <
self.ui.document:getPageFromXPointer(b.page)
local a_page = self.ui.document:getPageFromXPointer(a.page)
local b_page = self.ui.document:getPageFromXPointer(b.page)
return a_page < b_page
end
end
@@ -329,12 +341,8 @@ function ReaderBookmark:getDogearBookmarkIndex(pn_or_xp)
while _start <= _end do
_middle = math.floor((_start + _end)/2)
local v = self.bookmarks[_middle]
if self:isBookmarkMatch(v, pn_or_xp) then
if v.highlighted then
return
else
return _middle
end
if not v.highlighted and self:isBookmarkMatch(v, pn_or_xp) then
return _middle
elseif self:isBookmarkInPageOrder({page = pn_or_xp}, v) then
_end = _middle - 1
else