comparison view/Pane.cpp @ 921:4968bbaf1ed8 tonioni

Merge from default branch
author Chris Cannam
date Mon, 23 Mar 2015 10:04:51 +0000
parents 0e674f1bbf08 78e041e45ff0
children 26da827e8fb5
comparison
equal deleted inserted replaced
876:b62c2785ed83 921:4968bbaf1ed8
2022 int xdiff = point.x() - origin.x(); 2022 int xdiff = point.x() - origin.x();
2023 int ydiff = point.y() - origin.y(); 2023 int ydiff = point.y() - origin.y();
2024 2024
2025 int smallThreshold = 10, bigThreshold = 80; 2025 int smallThreshold = 10, bigThreshold = 80;
2026 2026
2027 if (m_manager) {
2028 smallThreshold = m_manager->scalePixelSize(smallThreshold);
2029 bigThreshold = m_manager->scalePixelSize(bigThreshold);
2030 }
2031
2027 // SVDEBUG << "Pane::updateDragMode: xdiff = " << xdiff << ", ydiff = " 2032 // SVDEBUG << "Pane::updateDragMode: xdiff = " << xdiff << ", ydiff = "
2028 // << ydiff << ", canMoveVertical = " << canMoveVertical << ", drag mode = " << m_dragMode << endl; 2033 // << ydiff << ", canMoveVertical = " << canMoveVertical << ", drag mode = " << m_dragMode << endl;
2029 2034
2030 if (dragMode == UnresolvedDrag) { 2035 if (dragMode == UnresolvedDrag) {
2031 2036
2286 // Coarse wheel information (or vertical zoom, which is 2291 // Coarse wheel information (or vertical zoom, which is
2287 // necessarily coarse itself) 2292 // necessarily coarse itself)
2288 2293
2289 // Sometimes on Linux we're seeing absurdly extreme angles on 2294 // Sometimes on Linux we're seeing absurdly extreme angles on
2290 // the first wheel event -- discard those entirely 2295 // the first wheel event -- discard those entirely
2291 if (abs(m_pendingWheelAngle) >= 600) { 2296 if (abs(m_pendingWheelAngle) > 1000) {
2292 m_pendingWheelAngle = 0; 2297 m_pendingWheelAngle = 0;
2293 return; 2298 return;
2294 } 2299 }
2295 2300
2296 while (abs(m_pendingWheelAngle) >= 120) { 2301 while (abs(m_pendingWheelAngle) >= 120) {