diff options
Diffstat (limited to 'src/gui/qml')
| -rw-r--r-- | src/gui/qml/ImageButton.qml | 2 | ||||
| -rw-r--r-- | src/gui/qml/TextImageButton.qml | 2 | ||||
| -rw-r--r-- | src/gui/qml/incoming_call.qml | 21 | ||||
| -rw-r--r-- | src/gui/qml/osd.qml | 20 |
4 files changed, 16 insertions, 29 deletions
diff --git a/src/gui/qml/ImageButton.qml b/src/gui/qml/ImageButton.qml index 3d76fa7..3e673fd 100644 --- a/src/gui/qml/ImageButton.qml +++ b/src/gui/qml/ImageButton.qml @@ -1,4 +1,4 @@ -import QtQuick 1.1 +import QtQuick 2.0 Rectangle { diff --git a/src/gui/qml/TextImageButton.qml b/src/gui/qml/TextImageButton.qml index 3630029..83f61d7 100644 --- a/src/gui/qml/TextImageButton.qml +++ b/src/gui/qml/TextImageButton.qml @@ -1,4 +1,4 @@ -import QtQuick 1.1 +import QtQuick 2.0 Rectangle { id: backgroundRect diff --git a/src/gui/qml/incoming_call.qml b/src/gui/qml/incoming_call.qml index 1b8428e..8f1ae0e 100644 --- a/src/gui/qml/incoming_call.qml +++ b/src/gui/qml/incoming_call.qml @@ -1,4 +1,4 @@ -import QtQuick 1.1 +import QtQuick 2.0 Rectangle { id: rectanglePopup @@ -63,21 +63,14 @@ Rectangle { MouseArea { anchors.fill: parent - property variant previousPosition + property real lastMouseX: 0 + property real lastMouseY: 0 onPressed: { - previousPosition = Qt.point(mouseX, mouseY) - } - onPositionChanged: { - if (pressedButtons == Qt.LeftButton) { - var dx = mouseX - previousPosition.x - var dy = mouseY - previousPosition.y - viewerWidget.pos = Qt.point(viewerWidget.pos.x + dx, - viewerWidget.pos.y + dy) - - previousPosition = Qt.point(mouseX, mouseY) - rectanglePopup.moved() - } + lastMouseX = mouseX + lastMouseY = mouseY } + onMouseXChanged: viewerWidget.x += (mouseX - lastMouseX) + onMouseYChanged: viewerWidget.y += (mouseY - lastMouseY) } } diff --git a/src/gui/qml/osd.qml b/src/gui/qml/osd.qml index 42f7b1f..f42fea7 100644 --- a/src/gui/qml/osd.qml +++ b/src/gui/qml/osd.qml @@ -1,4 +1,4 @@ -import QtQuick 1.1 +import QtQuick 2.0 Rectangle { id: rectangleOsd @@ -79,20 +79,14 @@ Rectangle { MouseArea { anchors.fill: parent - property variant previousPosition + property real lastMouseX: 0 + property real lastMouseY: 0 onPressed: { - previousPosition = Qt.point(mouseX, mouseY) - } - onPositionChanged: { - if (pressedButtons == Qt.LeftButton) { - var dx = mouseX - previousPosition.x - var dy = mouseY - previousPosition.y - viewerWidget.pos = Qt.point(viewerWidget.pos.x + dx, - viewerWidget.pos.y + dy) - - rectangleOsd.moved() - } + lastMouseX = mouseX + lastMouseY = mouseY } + onMouseXChanged: viewerWidget.x += (mouseX - lastMouseX) + onMouseYChanged: viewerWidget.y += (mouseY - lastMouseY) } } |