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

Dont allow drag-to-pan when image fits

Browse Source 
Also use "natural" direction when panning
This commit is contained in:
Kovid Goyal 2021-04-29 07:45:32 +05:30
parent 0f51fe1f66
commit dc1437c2bb
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/calibre/gui2/image_popup.py
View File

@ -9,7 +9,7 @@ __docformat__ = 'restructuredtext en'
from qt.core import ( from qt.core import (
QApplication, QCheckBox, QDialog, QDialogButtonBox, QHBoxLayout, QIcon, QImage, QApplication, QCheckBox, QDialog, QDialogButtonBox, QHBoxLayout, QIcon, QImage,
QLabel, QPainter, QPalette, QPixmap, QScrollArea, QSize, QSizePolicy, QLabel, QPainter, QPalette, QPixmap, QScrollArea, QSize, QSizePolicy,
QSvgRenderer, Qt, QTransform, QUrl, QVBoxLayout, pyqtSignal QSvgRenderer, Qt, QTransform, QUrl, QVBoxLayout
) )
from calibre import fit_image from calibre import fit_image
@ -39,19 +39,22 @@ def render_svg(widget, path):
class Label(QLabel): class Label(QLabel):
dragged = pyqtSignal(int, int) def __init__(self, scrollarea):
super().__init__(scrollarea)
def __init__(self, parent):
super().__init__(parent)
self.setBackgroundRole(QPalette.ColorRole.Text if QApplication.instance().is_dark_theme else QPalette.ColorRole.Base) self.setBackgroundRole(QPalette.ColorRole.Text if QApplication.instance().is_dark_theme else QPalette.ColorRole.Base)
self.setSizePolicy(QSizePolicy.Policy.Ignored, QSizePolicy.Policy.Ignored) self.setSizePolicy(QSizePolicy.Policy.Ignored, QSizePolicy.Policy.Ignored)
self.setScaledContents(True) self.setScaledContents(True)
self.default_cursor = self.cursor() self.default_cursor = self.cursor()
self.in_drag = False self.in_drag = False
self.prev_drag_position = None self.prev_drag_position = None
self.scrollarea = scrollarea
@property
def is_pannable(self):
return self.scrollarea.verticalScrollBar().isVisible() or self.scrollarea.horizontalScrollBar().isVisible()
def mousePressEvent(self, ev): def mousePressEvent(self, ev):
if ev.button() == Qt.MouseButton.LeftButton: if ev.button() == Qt.MouseButton.LeftButton and self.is_pannable:
self.setCursor(Qt.CursorShape.ClosedHandCursor) self.setCursor(Qt.CursorShape.ClosedHandCursor)
self.in_drag = True self.in_drag = True
self.prev_drag_position = ev.globalPos() self.prev_drag_position = ev.globalPos()
@ -68,9 +71,17 @@ class Label(QLabel):
if self.prev_drag_position is not None: if self.prev_drag_position is not None:
p = self.prev_drag_position p = self.prev_drag_position
self.prev_drag_position = pos = ev.globalPos() self.prev_drag_position = pos = ev.globalPos()
self.dragged.emit(pos.x() - p.x(), pos.y() - p.y()) self.dragged(pos.x() - p.x(), pos.y() - p.y())
return super().mouseMoveEvent(ev) return super().mouseMoveEvent(ev)
def dragged(self, dx, dy):
h = self.scrollarea.horizontalScrollBar()
if h.isVisible():
h.setValue(h.value() - dx)
v = self.scrollarea.verticalScrollBar()
if v.isVisible():
v.setValue(v.value() - dy)
class ImageView(QDialog): class ImageView(QDialog):
@ -86,12 +97,10 @@ class ImageView(QDialog):
self.factor = 1.0 self.factor = 1.0
self.geom_name = geom_name self.geom_name = geom_name
self.label = l = Label(self)
l.dragged.connect(self.dragged)
self.scrollarea = sa = QScrollArea() self.scrollarea = sa = QScrollArea()
sa.setAlignment(Qt.AlignmentFlag.AlignHCenter | Qt.AlignmentFlag.AlignVCenter) sa.setAlignment(Qt.AlignmentFlag.AlignHCenter | Qt.AlignmentFlag.AlignVCenter)
sa.setBackgroundRole(QPalette.ColorRole.Dark) sa.setBackgroundRole(QPalette.ColorRole.Dark)
self.label = l = Label(sa)
sa.setWidget(l) sa.setWidget(l)
self.bb = bb = QDialogButtonBox(QDialogButtonBox.StandardButton.Close) self.bb = bb = QDialogButtonBox(QDialogButtonBox.StandardButton.Close)
@ -238,14 +247,6 @@ class ImageView(QDialog):
event.accept() event.accept()
(self.zoom_out if d < 0 else self.zoom_in)() (self.zoom_out if d < 0 else self.zoom_in)()
def dragged(self, dx, dy):
h = self.scrollarea.horizontalScrollBar()
if h.isVisible():
h.setValue(h.value() + dx)
v = self.scrollarea.verticalScrollBar()
if v.isVisible():
v.setValue(v.value() + dy)
class ImagePopup(object): class ImagePopup(object):