Mercurial > hg > svgui
comparison view/Pane.cpp @ 900:1fc4f29feb2e cxx11
Merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 03 Mar 2015 09:33:59 +0000 |
parents | 899c4d7e7e63 78e041e45ff0 |
children | 4a578a360011 |
comparison
equal
deleted
inserted
replaced
898:2be9753651c8 | 900:1fc4f29feb2e |
---|---|
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 |