Improve adaptive thumbnail layout
This commit is contained in:
@@ -2208,8 +2208,9 @@ class MainWindow(QMainWindow):
|
||||
}
|
||||
QListWidget::item { padding: 6px; border-radius: 4px; border: 1px solid transparent; }
|
||||
QListWidget::item:selected { background: #27384d; color: #ffffff; border: 2px solid #4f89c8; }
|
||||
QListWidget#thumbnailList::item { margin: 4px 6px; padding: 8px; }
|
||||
QListWidget#thumbnailList::item { margin: 3px 4px; padding: 4px; }
|
||||
QListWidget#thumbnailList::item:selected { background: #26384d; border: 2px solid #5b9be3; }
|
||||
QLabel#thumbnailPageLabel { color: #f1f1f1; }
|
||||
QScrollArea#pdfCanvas, QWidget#pdfContinuousContent { background: #181a1c; border: none; }
|
||||
QLabel#emptyPage { background: #2d3034; color: #cfd3d8; padding: 28px; border: 1px solid #464a4f; }
|
||||
QLabel#pdfPage { background: #ffffff; color: #202020; padding: 0; border: 1px solid #53575c; }
|
||||
@@ -2286,8 +2287,9 @@ class MainWindow(QMainWindow):
|
||||
QListWidget::item { padding: 6px; border-radius: 4px; border: 1px solid transparent; }
|
||||
QListWidget::item:hover { background: #f0f3f8; }
|
||||
QListWidget::item:selected { background: #f8fbff; color: #0f3f7a; border: 2px solid #6aa3dc; }
|
||||
QListWidget#thumbnailList::item { margin: 4px 6px; padding: 8px; }
|
||||
QListWidget#thumbnailList::item { margin: 3px 4px; padding: 4px; }
|
||||
QListWidget#thumbnailList::item:selected { background: #f8fbff; border: 2px solid #2d73c5; }
|
||||
QLabel#thumbnailPageLabel { color: #202124; }
|
||||
QScrollArea#pdfCanvas, QWidget#pdfContinuousContent { background: #bfc4cb; border: none; }
|
||||
QLabel#emptyPage { background: #f8f9fb; color: #5f6368; padding: 28px; border: 1px solid #d3d6dc; }
|
||||
QLabel#pdfPage { background: #ffffff; color: #202020; padding: 0; border: 1px solid #b7bbc2; }
|
||||
|
||||
+65
-13
@@ -3,15 +3,41 @@ from __future__ import annotations
|
||||
from collections import deque
|
||||
|
||||
from PySide6.QtCore import QSize, Qt, QTimer, Signal
|
||||
from PySide6.QtGui import QIcon, QPixmap
|
||||
from PySide6.QtWidgets import QListWidget, QListWidgetItem, QTabWidget, QWidget, QVBoxLayout
|
||||
from PySide6.QtGui import QPixmap
|
||||
from PySide6.QtWidgets import QLabel, QListWidget, QListWidgetItem, QTabWidget, QWidget, QVBoxLayout
|
||||
|
||||
from pdfreaderlite.core.document import PdfDocument
|
||||
|
||||
|
||||
class ThumbnailItemWidget(QWidget):
|
||||
def __init__(self, page_text: str) -> None:
|
||||
super().__init__()
|
||||
self.setObjectName("thumbnailItemWidget")
|
||||
self.image_label = QLabel()
|
||||
self.image_label.setObjectName("thumbnailImage")
|
||||
self.image_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
|
||||
self.page_label = QLabel(page_text)
|
||||
self.page_label.setObjectName("thumbnailPageLabel")
|
||||
self.page_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
|
||||
|
||||
layout = QVBoxLayout(self)
|
||||
layout.setContentsMargins(0, 0, 0, 0)
|
||||
layout.setSpacing(4)
|
||||
layout.addWidget(self.image_label)
|
||||
layout.addWidget(self.page_label)
|
||||
|
||||
def set_item_width(self, width: int) -> None:
|
||||
self.setFixedWidth(width)
|
||||
self.image_label.setFixedWidth(width)
|
||||
self.page_label.setFixedWidth(width)
|
||||
|
||||
def set_pixmap(self, pixmap: QPixmap) -> None:
|
||||
self.image_label.setPixmap(pixmap)
|
||||
|
||||
|
||||
class ThumbnailList(QListWidget):
|
||||
page_selected = Signal(int)
|
||||
MAX_THUMBNAIL_WIDTH = 170
|
||||
MAX_THUMBNAIL_WIDTH = 255
|
||||
|
||||
def __init__(self) -> None:
|
||||
super().__init__()
|
||||
@@ -26,7 +52,7 @@ class ThumbnailList(QListWidget):
|
||||
|
||||
self._last_thumbnail_width = 0
|
||||
self._update_thumbnail_metrics()
|
||||
self.setViewMode(QListWidget.ViewMode.IconMode)
|
||||
self.setViewMode(QListWidget.ViewMode.ListMode)
|
||||
self.setFlow(QListWidget.Flow.TopToBottom)
|
||||
self.setWrapping(False)
|
||||
self.setResizeMode(QListWidget.ResizeMode.Adjust)
|
||||
@@ -39,18 +65,29 @@ class ThumbnailList(QListWidget):
|
||||
|
||||
def _update_thumbnail_metrics(self) -> None:
|
||||
viewport_width = max(120, self.viewport().width())
|
||||
thumbnail_width = max(92, min(self.MAX_THUMBNAIL_WIDTH, viewport_width - 34))
|
||||
thumbnail_height = int(thumbnail_width * 0.76)
|
||||
thumbnail_width = max(92, min(self.MAX_THUMBNAIL_WIDTH, viewport_width - 36))
|
||||
gap = max(1, round(self.fontMetrics().height() * 0.25))
|
||||
label_height = self.fontMetrics().height() + 8
|
||||
grid_size = QSize(thumbnail_width + 26, thumbnail_height + label_height + gap)
|
||||
if thumbnail_width != self._last_thumbnail_width:
|
||||
self._rendered_keys.clear()
|
||||
self._last_thumbnail_width = thumbnail_width
|
||||
self.setIconSize(QSize(thumbnail_width, thumbnail_height))
|
||||
self.setGridSize(grid_size)
|
||||
self._update_item_widths()
|
||||
self.setSpacing(gap)
|
||||
|
||||
def _item_width(self) -> int:
|
||||
return self._last_thumbnail_width + 20
|
||||
|
||||
def _empty_item_height(self) -> int:
|
||||
return int(self._last_thumbnail_width * 1.2) + self.fontMetrics().height() + 14
|
||||
|
||||
def _update_item_widths(self) -> None:
|
||||
item_width = self._item_width()
|
||||
for row in range(self.count()):
|
||||
item = self.item(row)
|
||||
widget = self.itemWidget(item)
|
||||
if isinstance(widget, ThumbnailItemWidget):
|
||||
widget.set_item_width(item_width)
|
||||
item.setSizeHint(QSize(item_width, max(item.sizeHint().height(), self._empty_item_height())))
|
||||
|
||||
def load_document(self, document: PdfDocument) -> None:
|
||||
self._thumbnail_timer.stop()
|
||||
same_document = self.document is document
|
||||
@@ -64,7 +101,12 @@ class ThumbnailList(QListWidget):
|
||||
for page_index in range(document.page_count):
|
||||
item = QListWidgetItem(f"第 {page_index + 1} 页")
|
||||
item.setData(Qt.ItemDataRole.UserRole, page_index)
|
||||
item.setText("")
|
||||
item.setSizeHint(QSize(self._item_width(), self._empty_item_height()))
|
||||
self.addItem(item)
|
||||
widget = ThumbnailItemWidget(f"第 {page_index + 1} 页")
|
||||
widget.set_item_width(self._item_width())
|
||||
self.setItemWidget(item, widget)
|
||||
|
||||
QTimer.singleShot(0, self.schedule_visible_thumbnails)
|
||||
|
||||
@@ -110,8 +152,18 @@ class ThumbnailList(QListWidget):
|
||||
return
|
||||
|
||||
item = self.item(page_index)
|
||||
image = self.document.render_thumbnail(page_index, self.iconSize().width())
|
||||
item.setIcon(QIcon(QPixmap.fromImage(image)))
|
||||
image = self.document.render_thumbnail(page_index, self._last_thumbnail_width)
|
||||
pixmap = QPixmap.fromImage(image)
|
||||
widget = self.itemWidget(item)
|
||||
if isinstance(widget, ThumbnailItemWidget):
|
||||
widget.set_item_width(self._item_width())
|
||||
widget.set_pixmap(pixmap)
|
||||
item.setSizeHint(
|
||||
QSize(
|
||||
self._item_width(),
|
||||
pixmap.height() + self.fontMetrics().height() + 18,
|
||||
)
|
||||
)
|
||||
self._rendered_keys.add(render_key)
|
||||
|
||||
def _queue_thumbnail(self, page_index: int) -> None:
|
||||
@@ -144,7 +196,7 @@ class Sidebar(QTabWidget):
|
||||
|
||||
self.addTab(thumb_page, "缩略图")
|
||||
self.setMinimumWidth(150)
|
||||
self.setMaximumWidth(224)
|
||||
self.setMaximumWidth(330)
|
||||
|
||||
def load_document(self, document: PdfDocument) -> None:
|
||||
self.thumbnails.load_document(document)
|
||||
|
||||
Reference in New Issue
Block a user