diff options
| author | Adrien Tétar | 2015-10-24 11:59:03 +0200 |
|---|---|---|
| committer | Adrien Tétar | 2015-10-24 11:59:03 +0200 |
| commit | b6d4feaba7c9f3e9b05d1a76187876715538cfce (patch) | |
| tree | 93f10b8c6a9c28a966f8c5ffd6fad1cfce9a2442 /Lib/defconQt/glyphView.py | |
| parent | 6c473c9ebffd4feb90088dbd95ff3c472fce9130 (diff) | |
| download | trufont-b6d4feaba7c9f3e9b05d1a76187876715538cfce.tar.bz2 | |
meta: consolidate callbacks/scrolling/sizing
Diffstat (limited to 'Lib/defconQt/glyphView.py')
| -rw-r--r-- | Lib/defconQt/glyphView.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Lib/defconQt/glyphView.py b/Lib/defconQt/glyphView.py index 29255e2..87232c3 100644 --- a/Lib/defconQt/glyphView.py +++ b/Lib/defconQt/glyphView.py @@ -2367,10 +2367,12 @@ class GlyphView(QGraphicsView): ''' def wheelEvent(self, event): - factor = pow(1.2, event.angleDelta().y() / 120.0) - event.accept() - - self.scale(factor, factor) + if event.modifiers() & Qt.ControlModifier: + factor = pow(1.2, event.angleDelta().y() / 120.0) + self.scale(factor, factor) + event.accept() + else: + super().wheelEvent(event) def scaleElements(self): # TODO: stop displaying SimpleTextItems at certains sizes, maybe anchor |