[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/kst/portto4/kst/src/libkstapp
From: Barth Netterfield <netterfield () astro ! utoronto ! ca>
Date: 2012-10-23 15:09:32
Message-ID: 20121023150932.49694AC854 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1322162 by netterfield:
BUG: 306395
Scroll wheel respects tied zoom.
M +0 -8 plotitem.cpp
M +8 -8 plotrenderitem.cpp
--- branches/work/kst/portto4/kst/src/libkstapp/plotitem.cpp #1322161:1322162
@@ -3096,10 +3096,6 @@
void PlotItem::zoomXRight(bool force) {
- //if (zoomOnlyMode() == View::ZoomOnlyX) {
- // zoomXOut(force);
- // return;
- //}
if (isInSharedAxisBox() && !force) {
sharedAxisBox()->zoomXRight(this);
} else {
@@ -3111,10 +3107,6 @@
void PlotItem::zoomXLeft(bool force) {
- //if (zoomOnlyMode() == View::ZoomOnlyX) {
- // zoomXIn(force);
- // return;
- //}
if (isInSharedAxisBox() && !force) {
sharedAxisBox()->zoomXLeft(this);
} else {
--- branches/work/kst/portto4/kst/src/libkstapp/plotrenderitem.cpp #1322161:1322162
@@ -512,17 +512,17 @@
bool zoom = false;
if (modifiers & Qt::SHIFT) {
if (event->delta()>0) {
- plotItem()->zoomYIn(true);
+ plotItem()->zoomYIn();
} else {
- plotItem()->zoomYOut(true);
+ plotItem()->zoomYOut();
}
zoom = true;
}
if (modifiers & Qt::CTRL){
if (event->delta()>0) {
- plotItem()->zoomXIn(true);
+ plotItem()->zoomXIn();
} else {
- plotItem()->zoomXOut(true);
+ plotItem()->zoomXOut();
}
zoom = true;
}
@@ -533,15 +533,15 @@
if ((modifiers & Qt::ALT) || zoomOnlyMode() == View::ZoomOnlyY) {
if (event->delta()>0) {
- plotItem()->zoomYDown(true);
+ plotItem()->zoomYDown();
} else {
- plotItem()->zoomYUp(true);
+ plotItem()->zoomYUp();
}
} else {
if (event->delta()>0) {
- plotItem()->zoomXLeft(true);
+ plotItem()->zoomXLeft();
} else {
- plotItem()->zoomXRight(true);
+ plotItem()->zoomXRight();
}
}
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic