Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2026-01-23 20:27:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Bookshelf: fix Page Up/Down dosn't work when too close of the ends

Browse Source
This commit is contained in:
un-pogaz 2026-01-05 20:02:55 +01:00
parent 6ce194ecc2
commit 7d29b0d572
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/gui2/library/bookshelf_view.py
View File

@ -1115,11 +1115,13 @@ class BookCase(QObject):
s, e = min(aidx, bidx), max(aidx, bidx)
yield from map(self.book_id_to_row_map.__getitem__, self.book_ids_in_visual_order[s:e+1])
def visual_neighboring_book(self, book_id: int, delta: int = 1, allow_wrap: bool = False) -> int:
def visual_neighboring_book(self, book_id: int, delta: int = 1, allow_wrap: bool = False, in_bound: bool = False) -> int:
idx = self.book_id_visual_order_map[book_id]
nidx = idx + delta
if allow_wrap:
nidx = (nidx + len(self.book_ids_in_visual_order)) % len(self.book_ids_in_visual_order)
if in_bound:
nidx = max(0, min(len(self.book_ids_in_visual_order)-1), nidx)
if 0 <= nidx < len(self.book_ids_in_visual_order):
return self.book_ids_in_visual_order[nidx]
return 0
@ -1134,7 +1136,7 @@ class BookCase(QObject):
return ci.items[0 if first else -1].book_id
return 0
def book_in_column_of(self, book_id: int, delta: int = 1, allow_wrap: bool = False) -> int:
def book_in_column_of(self, book_id: int, delta: int = 1, allow_wrap: bool = False, in_bound: bool = False) -> int:
if not (si := self.book_id_to_item_map.get(book_id)):
return
if not (ci := self.shelf_of_book(book_id)):
@ -1143,6 +1145,8 @@ class BookCase(QObject):
num_shelves = len(self.items) // 2
if allow_wrap:
shelf_idx = (shelf_idx + num_shelves) % num_shelves
if in_bound:
shelf_idx = max(0, min(len(self.num_shelves)-1), shelf_idx)
if shelf_idx < 0 or shelf_idx >= num_shelves:
return 0
target_shelf = self.items[shelf_idx * 2]
@ -2094,9 +2098,9 @@ class BookshelfView(MomentumScrollMixin, QAbstractScrollArea):
case Qt.Key.Key_Down:
target_book_id = self.bookcase.book_in_column_of(current_book_id, delta=1)
case Qt.Key.Key_PageUp:
target_book_id = self.bookcase.book_in_column_of(current_book_id, delta=-self.shelves_per_screen)
target_book_id = self.bookcase.book_in_column_of(current_book_id, delta=-self.shelves_per_screen, in_bound=True)
case Qt.Key.Key_PageDown:
target_book_id = self.bookcase.book_in_column_of(current_book_id, delta=self.shelves_per_screen)
target_book_id = self.bookcase.book_in_column_of(current_book_id, delta=self.shelves_per_screen, in_bound=True)
case Qt.Key.Key_Home:
if has_ctrl:
target_book_id = self.bookcase.book_ids_in_visual_order[0]