File tree Expand file tree Collapse file tree 1 file changed +6
-4
lines changed Expand file tree Collapse file tree 1 file changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -14,9 +14,6 @@ Entity {
1414 property real translateSpeed: 75.0
1515 property real tiltSpeed: 500.0
1616 property real panSpeed: 500.0
17- readonly property bool moving: actionLMB .active
18- readonly property bool panning: (keyboardHandler ._pressed && actionLMB .active && actionShift .active ) || actionMMB .active
19- readonly property bool zooming: keyboardHandler ._pressed && actionRMB .active && actionAlt .active
2017 property alias focus: keyboardHandler .focus
2118 readonly property bool pickingActive: actionControl .active && keyboardHandler ._pressed
2219 property alias rotationSpeed: trackball .rotationSpeed
@@ -68,7 +65,12 @@ Entity {
6865 const dt = 0.02
6966 var d
7067
71- if (panning) { // Translate
68+ var moving = mouse .buttons & Qt .LeftButton
69+ var panning = (mouse .buttons & Qt .MiddleButton )
70+ var panningAlt = actionShift .active && (mouse .buttons & Qt .LeftButton )
71+ var zooming = actionAlt .active && (mouse .buttons & Qt .RightButton )
72+
73+ if (panning || panningAlt) { // Translate
7274 d = (root .camera .viewCenter .minus (root .camera .position )).length () * 0.03
7375 var tx = axisMX .value * root .translateSpeed * d
7476 var ty = axisMY .value * root .translateSpeed * d
You can’t perform that action at this time.
0 commit comments