diff --git a/PropertyEditor/resources/Qml/ValueEditor/NumberBox.qml b/PropertyEditor/resources/Qml/ValueEditor/NumberBox.qml index 2178bb6..e3cf142 100644 --- a/PropertyEditor/resources/Qml/ValueEditor/NumberBox.qml +++ b/PropertyEditor/resources/Qml/ValueEditor/NumberBox.qml @@ -121,25 +121,15 @@ Item{ onPositionChanged: (mouse)=>{ if(!input.enabled && mouse.buttons&Qt.LeftButton){ - if(!isLimited){ - var offset = mouse.x - lastPressX - setNumber(number + offset * step) - var global = dragArea.mapToGlobal(lastPressX, lastPressY) - var local = dragArea.mapFromGlobal(global.x,global.y) - helper.setCursorPos(global.x,global.y) - } - else{ - var xPercent = Math.max(0, Math.min(1, mouse.x / dragArea.width)) - var range = max - min - var newValue = min + xPercent * range - control.setNumber(newValue) - const validMouseX = Math.max (0, Math.min (dragArea.width, mouse.x)); - const validMouseY = Math.max (0, Math.min (dragArea.height, mouse.y)); - if (mouse.x !== validMouseX || mouse.y !== validMouseY) { - const validGlobalPos = dragArea.mapToGlobal (validMouseX, validMouseY); - helper.setCursorPos (validGlobalPos.x, validGlobalPos.y); - } + var offset = mouse.x - lastPressX + var newValue = number + offset * step + if(isLimited){ + if(newValue > max) newValue = max + if(newValue < min) newValue = min } + setNumber(newValue) + var global = dragArea.mapToGlobal(lastPressX, lastPressY) + helper.setCursorPos(global.x,global.y) } } }