diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-13 03:05:08 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-13 03:05:08 +0200 |
| commit | 2ba9cc9aad6fbd950ac4aa090f6480a500679ea2 (patch) | |
| tree | 6241c6cbfcaca50addd5046990579a8ae7c3acf3 /src/pixeltool | |
| parent | 127bb943e06e754cff4aa27ee1c5464bb491d135 (diff) | |
| parent | d92b976f7d092a31c67edc2c515ac2444cd2808d (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I72bd169686f45e97974f6773a9e640fe2c2d42b2
Diffstat (limited to 'src/pixeltool')
| -rw-r--r-- | src/pixeltool/qpixeltool.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pixeltool/qpixeltool.cpp b/src/pixeltool/qpixeltool.cpp index 4abc45325..8446a3ac4 100644 --- a/src/pixeltool/qpixeltool.cpp +++ b/src/pixeltool/qpixeltool.cpp @@ -296,10 +296,10 @@ void QPixelTool::keyPressEvent(QKeyEvent *e) toggleFreeze(); break; case Qt::Key_Plus: - setZoom(m_zoom + 1); + increaseZoom(); break; case Qt::Key_Minus: - setZoom(m_zoom - 1); + decreaseZoom(); break; case Qt::Key_PageUp: setGridSize(m_gridSize + 1); @@ -489,7 +489,7 @@ void QPixelTool::contextMenuEvent(QContextMenuEvent *e) // LCD mode looks off unless zoom is dividable by 3 if (m_lcdMode && m_zoom % 3) - setZoom((m_zoom + 1) / 3); + setZoom(qMax(3, (m_zoom + 1) / 3)); } QSize QPixelTool::sizeHint() const |