Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-08-11 09:13:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Split book view: Fix vertical scroll position of the two views getting out of sync after doing some searches. Fixes #1748739 [split book list display error](https://bugs.launchpad.net/calibre/+bug/1748739)

Browse Source
This commit is contained in:
Kovid Goyal 2018-02-12 11:00:55 +05:30
parent 2bd105d8b9
commit aff999cd4b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/calibre/gui2/library/views.py
View File

@ -323,11 +323,11 @@ class BooksView(QTableView): # {{{
self.allow_mirroring = True self.allow_mirroring = True
if self.is_library_view: if self.is_library_view:
self.set_pin_view_visibility(gprefs['book_list_split']) self.set_pin_view_visibility(gprefs['book_list_split'])
self.pin_view.verticalScrollBar().valueChanged.connect(self.verticalScrollBar().setValue)
self.verticalScrollBar().valueChanged.connect(self.pin_view.verticalScrollBar().setValue)
for wv in self, self.pin_view: for wv in self, self.pin_view:
wv.selectionModel().currentRowChanged.connect(partial(self.mirror_selection_between_views, wv)) wv.selectionModel().currentRowChanged.connect(partial(self.mirror_selection_between_views, wv))
wv.selectionModel().selectionChanged.connect(partial(self.mirror_selection_between_views, wv)) wv.selectionModel().selectionChanged.connect(partial(self.mirror_selection_between_views, wv))
wv.verticalScrollBar().valueChanged.connect(partial(self.mirror_vscroll, wv))
wv.verticalScrollBar().rangeChanged.connect(partial(self.mirror_vscroll, wv))
else: else:
self.pin_view.setVisible(False) self.pin_view.setVisible(False)
@ -350,6 +350,16 @@ class BooksView(QTableView): # {{{
nci = dest.model().index(nci.row(), ci.column()) nci = dest.model().index(nci.row(), ci.column())
dest.selectionModel().setCurrentIndex(nci, QItemSelectionModel.NoUpdate) dest.selectionModel().setCurrentIndex(nci, QItemSelectionModel.NoUpdate)
self.allow_mirroring = True self.allow_mirroring = True
def mirror_vscroll(self, src, *a):
if self.allow_mirroring:
dest = self.pin_view if src is self else self
if dest is self.pin_view and not dest.isVisible():
return
self.allow_mirroring = False
s, d = src.verticalScrollBar(), dest.verticalScrollBar()
d.setRange(s.minimum(), s.maximum()), d.setValue(s.value())
self.allow_mirroring = True
# }}} # }}}
# Column Header Context Menu {{{ # Column Header Context Menu {{{
@ -958,10 +968,10 @@ class BooksView(QTableView): # {{{
pass pass
def current_book_state(self): def current_book_state(self):
return self.current_book, self.horizontalScrollBar().value() return self.current_book, self.horizontalScrollBar().value(), self.pin_view.horizontalScrollBar().value()
def restore_current_book_state(self, state): def restore_current_book_state(self, state):
book_id, hpos = state book_id, hpos, pv_hpos = state
try: try:
row = self.model().db.data.id_to_index(book_id) row = self.model().db.data.id_to_index(book_id)
except (IndexError, ValueError, KeyError, TypeError, AttributeError): except (IndexError, ValueError, KeyError, TypeError, AttributeError):
@ -969,6 +979,8 @@ class BooksView(QTableView): # {{{
self.set_current_row(row) self.set_current_row(row)
self.scroll_to_row(row) self.scroll_to_row(row)
self.horizontalScrollBar().setValue(hpos) self.horizontalScrollBar().setValue(hpos)
if self.pin_view.isVisible():
self.pin_view.horizontalScrollBar().setValue(pv_hpos)
def set_current_row(self, row=0, select=True, for_sync=False): def set_current_row(self, row=0, select=True, for_sync=False):
if row > -1 and row < self.model().rowCount(QModelIndex()): if row > -1 and row < self.model().rowCount(QModelIndex()):