mirror of
git://github.com/kovidgoyal/calibre.git
synced 2026-05-08 14:04:12 +02:00
Viewer: Fix previous/next buttons iterating over removed bookmarks
This commit is contained in:
parent
eb9d921f10
commit
587b113c84
1 changed files with 11 additions and 5 deletions
|
|
@ -51,11 +51,17 @@ def keyPressEvent(self, ev):
|
|||
return QListWidget.keyPressEvent(self, ev)
|
||||
|
||||
def activate_related_bookmark(self, delta=1):
|
||||
if self.count() > 0:
|
||||
row = self.currentRow()
|
||||
nrow = (row + delta + self.count()) % self.count()
|
||||
self.setCurrentRow(nrow)
|
||||
self.bookmark_activated.emit(self.currentItem())
|
||||
if not self.count():
|
||||
return
|
||||
items = [self.item(r) for r in range(self.count())]
|
||||
row = self.currentRow()
|
||||
current_item = items[row]
|
||||
items = [i for i in items if not i.isHidden()]
|
||||
count = len(items)
|
||||
row = items.index(current_item)
|
||||
nrow = (row + delta + count) % count
|
||||
self.setCurrentItem(items[nrow])
|
||||
self.bookmark_activated.emit(self.currentItem())
|
||||
|
||||
def next_bookmark(self):
|
||||
self.activate_related_bookmark()
|
||||
|
|
|
|||
Loading…
Reference in a new issue