Mirrors/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-12-27 23:45:15 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Bookshelf: Hide scrollbar when not needed
Some checks are pending
CI / Test on ${{ matrix.os }} (macos-latest) (push) Waiting to run
Details
CI / Test on ${{ matrix.os }} (ubuntu-latest) (push) Waiting to run
Details
CI / Test on ${{ matrix.os }} (windows-latest) (push) Waiting to run
Details
CI / Test on Arch (push) Waiting to run
Details
CodeQL / CodeQL-Build (actions, ubuntu-latest) (push) Waiting to run
Details
CodeQL / CodeQL-Build (c, ubuntu-latest) (push) Waiting to run
Details
CodeQL / CodeQL-Build (c, windows-latest) (push) Waiting to run
Details
CodeQL / CodeQL-Build (python, ubuntu-latest) (push) Waiting to run
Details
Depscan / Scan dependencies for vulnerabilities (push) Waiting to run
Details
Transifex / Update translations on Transifex (push) Waiting to run
Details

Browse Source
This commit is contained in:
Kovid Goyal 2025-12-26 17:26:13 +05:30
parent aa1a26b442
commit e4dd51df48
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1268,10 +1268,7 @@ class BookshelfView(MomentumScrollMixin, QAbstractScrollArea):
self.gui = gui self.gui = gui
self._model: BooksModel | None = None self._model: BooksModel | None = None
self.context_menu: QMenu | None = None self.context_menu: QMenu | None = None
# Since layouting is expensive and dependent on width and the scrollbar self.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded)
# visibility in turn is dependent on layouting and affects width, we
# keep scrollbar always on
self.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOn)
self.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff) self.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
self.setMouseTracking(True) self.setMouseTracking(True)
@ -1360,7 +1357,7 @@ class BookshelfView(MomentumScrollMixin, QAbstractScrollArea):
'''Refresh the gui and render settings.''' '''Refresh the gui and render settings.'''
self.cover_cache.set_disk_cache_max_size(gprefs['bookshelf_disk_cache_size']) self.cover_cache.set_disk_cache_max_size(gprefs['bookshelf_disk_cache_size'])
self.layout_constraints = self.layout_constraints._replace(width=self.get_available_width()) self.layout_constraints = self.layout_constraints._replace(width=self.get_available_width())
self._update_ram_cache_size() self.update_ram_cache_size()
self.bookcase.clear_spine_width_cache() self.bookcase.clear_spine_width_cache()
self.invalidate() self.invalidate()
@ -1442,16 +1439,21 @@ class BookshelfView(MomentumScrollMixin, QAbstractScrollArea):
return True return True
return super().event(ev) return super().event(ev)
def _update_scrollbar_ranges(self): def update_scrollbar_ranges(self):
'''Update scrollbar ranges based on the current shelf layouts.''' '''Update scrollbar ranges based on the current shelf layouts.'''
total_height = self.bookcase.max_possible_height total_height = self.bookcase.max_possible_height
viewport_height = self.viewport().height() viewport_height = self.viewport().height()
self.verticalScrollBar().setRange(0, max(0, total_height - viewport_height)) self.verticalScrollBar().setRange(0, max(0, total_height - viewport_height))
self.verticalScrollBar().setPageStep(viewport_height) self.verticalScrollBar().setPageStep(viewport_height)
self.verticalScrollBar().setSingleStep(self.layout_constraints.step_height) self.verticalScrollBar().setSingleStep(self.layout_constraints.step_height)
self._update_ram_cache_size() self.update_ram_cache_size()
def get_available_width(self): def get_available_width(self) -> int:
# We always layout assuming scrollbar takes up space unless it is a
# transient scrollbar. This means when all books fit in the viewport there
# will be some extra space on the right. This is an acceptable
# compromise since, layouting is expensive and we cannot know if the
# scrollbar is needed till we do layouting once.
sw = 0 if self.has_transient_scrollbar else self.verticalScrollBar().width() sw = 0 if self.has_transient_scrollbar else self.verticalScrollBar().width()
return self.width() - (2 * self.layout_constraints.side_margin) - sw return self.width() - (2 * self.layout_constraints.side_margin) - sw
@ -1461,13 +1463,13 @@ class BookshelfView(MomentumScrollMixin, QAbstractScrollArea):
group_field_name=self.grouping_mode) group_field_name=self.grouping_mode)
if set_of_books_changed: if set_of_books_changed:
self.expanded_cover.invalidate() self.expanded_cover.invalidate()
self._update_scrollbar_ranges() self.update_scrollbar_ranges()
self.update_viewport() self.update_viewport()
def on_shelf_layout_done(self, books: CaseItem, shelf: CaseItem) -> None: def on_shelf_layout_done(self, books: CaseItem, shelf: CaseItem) -> None:
if self.view_is_visible(): if self.view_is_visible():
if self.bookcase.layout_finished: if self.bookcase.layout_finished:
self._update_scrollbar_ranges() self.update_scrollbar_ranges()
y = books.start_y y = books.start_y
height = books.height + shelf.height height = books.height + shelf.height
r = self.viewport().rect() r = self.viewport().rect()
@ -1481,7 +1483,7 @@ class BookshelfView(MomentumScrollMixin, QAbstractScrollArea):
lc = self.layout_constraints lc = self.layout_constraints
return max(1, viewport_height / (lc.step_height)) return max(1, viewport_height / (lc.step_height))
def _update_ram_cache_size(self): def update_ram_cache_size(self):
lc = self.layout_constraints lc = self.layout_constraints
books_per_shelf = self.get_available_width() / lc.min_spine_width books_per_shelf = self.get_available_width() / lc.min_spine_width
lm = gprefs['bookshelf_cache_size_multiple'] * books_per_shelf * self.shelves_per_screen lm = gprefs['bookshelf_cache_size_multiple'] * books_per_shelf * self.shelves_per_screen