Mercurial > hg > svgui
comparison view/Pane.cpp @ 895:a3b3b64fbc43 alignment_view
Merge from default branch
author | Chris Cannam |
---|---|
date | Thu, 15 Jan 2015 10:44:10 +0000 |
parents | d4446f267e12 241688360929 |
children | 499b637f2a26 |
comparison
equal
deleted
inserted
replaced
894:d4446f267e12 | 895:a3b3b64fbc43 |
---|---|
2299 // the first wheel event -- discard those entirely | 2299 // the first wheel event -- discard those entirely |
2300 if (abs(m_pendingWheelAngle) >= 600) { | 2300 if (abs(m_pendingWheelAngle) >= 600) { |
2301 m_pendingWheelAngle = 0; | 2301 m_pendingWheelAngle = 0; |
2302 return; | 2302 return; |
2303 } | 2303 } |
2304 | 2304 |
2305 while (abs(m_pendingWheelAngle) >= 120) { | 2305 while (abs(m_pendingWheelAngle) >= 120) { |
2306 | 2306 |
2307 int sign = (m_pendingWheelAngle < 0 ? -1 : 1); | 2307 int sign = (m_pendingWheelAngle < 0 ? -1 : 1); |
2308 | 2308 |
2309 if (horizontal) { | 2309 if (horizontal) { |