mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-07 18:24:30 -04:00
Fix scrollbars showing up in book info widget
This commit is contained in:
parent
55e89079d4
commit
ba5f3a8c76
@ -376,7 +376,7 @@ class ResultsView(QTreeView):
|
|||||||
results, match = self.m.data_for_index(index)
|
results, match = self.m.data_for_index(index)
|
||||||
m = QMenu(self)
|
m = QMenu(self)
|
||||||
if results:
|
if results:
|
||||||
m.addAction(QIcon.ic('auto-scroll.png'), _('Jump to this book in the library'), partial(jump_to_book, results.book_id))
|
m.addAction(QIcon.ic('lt.png'), _('Jump to this book in the library'), partial(jump_to_book, results.book_id))
|
||||||
m.addAction(QIcon.ic('marked.png'), _('Mark this book in the library'), partial(mark_books, results.book_id))
|
m.addAction(QIcon.ic('marked.png'), _('Mark this book in the library'), partial(mark_books, results.book_id))
|
||||||
m.addSeparator()
|
m.addSeparator()
|
||||||
m.addAction(QIcon.ic('plus.png'), _('Expand all'), self.expandAll)
|
m.addAction(QIcon.ic('plus.png'), _('Expand all'), self.expandAll)
|
||||||
@ -487,9 +487,11 @@ class ResultDetails(QWidget):
|
|||||||
d = self.book_info.document()
|
d = self.book_info.document()
|
||||||
d.setDocumentMargin(0)
|
d.setDocumentMargin(0)
|
||||||
d.setTextWidth(float(w))
|
d.setTextWidth(float(w))
|
||||||
self.book_info.setGeometry(QRect(self.pixmap_label.geometry().right() + 8, 0, w, int(math.ceil(d.size().height()))))
|
h = min(int(math.ceil(d.size().height())), self.pixmap_label.height())
|
||||||
self.book_info.verticalScrollBar().setVisible(False)
|
self.book_info.setGeometry(QRect(self.pixmap_label.geometry().right() + 8, 0, w, h))
|
||||||
self.book_info.horizontalScrollBar().setVisible(False)
|
if self.book_info.horizontalScrollBar().isVisible():
|
||||||
|
h += self.book_info.horizontalScrollBar().height() + 1
|
||||||
|
self.book_info.setGeometry(QRect(self.pixmap_label.geometry().right() + 8, 0, w, h))
|
||||||
|
|
||||||
def show_result(self, results, individual_match=None):
|
def show_result(self, results, individual_match=None):
|
||||||
old_current_book_id, self.current_book_id = self.current_book_id, results.book_id
|
old_current_book_id, self.current_book_id = self.current_book_id, results.book_id
|
||||||
|
Loading…
x
Reference in New Issue
Block a user