Implement View::setX() and setY()

Change-Id: Ifa4c9ff73686b4bca7157f68a4d2df5f25047109
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

2 files changed, 21 insertions, 4 deletions

diff --git a/src/qmlandroid/view/qqmlandroidview.cpp b/src/qmlandroid/view/qqmlandroidview.cpp
index 3455395..8218ff1 100644
--- a/src/qmlandroid/view/qqmlandroidview.cpp
+++ b/src/qmlandroid/view/qqmlandroidview.cpp
@@ -234,12 +234,22 @@ bool QQmlAndroidView::updateFocus(bool arg)
 
 qreal QQmlAndroidView::x() const
 {
-    return left(); // TODO: + translationX
+    return left() + translationX();
+}
+
+void QQmlAndroidView::setX(qreal x)
+{
+    setTranslationX(x - left());
 }
 
 qreal QQmlAndroidView::y() const
 {
-    return top(); // TODO: + translationY
+    return top() + translationY();
+}
+
+void QQmlAndroidView::setY(qreal y)
+{
+    setTranslationY(y - top());
 }
 
 qreal QQmlAndroidView::z() const
@@ -265,6 +275,7 @@ void QQmlAndroidView::setTop(int top)
         m_top = top;
         QtQmlAndroid::callIntMethod(instance(), "setTop", top);
         emit topChanged();
+        emit yChanged();
     }
 }
 
@@ -281,6 +292,7 @@ void QQmlAndroidView::setLeft(int left)
         m_left = left;
         QtQmlAndroid::callIntMethod(instance(), "setLeft", left);
         emit leftChanged();
+        emit xChanged();
     }
 }
 
@@ -560,6 +572,7 @@ void QQmlAndroidView::setTranslationX(qreal translationX)
         m_translationX = translationX;
         QtQmlAndroid::callRealMethod(instance(), "setTranslationX", translationX);
         emit translationXChanged();
+        emit xChanged();
     }
 }
 
@@ -576,6 +589,7 @@ void QQmlAndroidView::setTranslationY(qreal translationY)
         m_translationY = translationY;
         QtQmlAndroid::callRealMethod(instance(), "setTranslationY", translationY);
         emit translationYChanged();
+        emit yChanged();
     }
 }
 
diff --git a/src/qmlandroid/view/qqmlandroidview_p.h b/src/qmlandroid/view/qqmlandroidview_p.h
index 15a0d18..84b765e 100644
--- a/src/qmlandroid/view/qqmlandroidview_p.h
+++ b/src/qmlandroid/view/qqmlandroidview_p.h
@@ -73,8 +73,8 @@ class Q_QMLANDROID_EXPORT QQmlAndroidView : public QQmlAndroidContextual
     Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
     Q_PROPERTY(bool focus READ hasFocus NOTIFY focusChanged)
 
-    Q_PROPERTY(qreal x READ x NOTIFY xChanged)
-    Q_PROPERTY(qreal y READ y NOTIFY yChanged)
+    Q_PROPERTY(qreal x READ x WRITE setX NOTIFY xChanged)
+    Q_PROPERTY(qreal y READ y WRITE setY NOTIFY yChanged)
     Q_PROPERTY(qreal z READ z WRITE setZ NOTIFY zChanged)
 
     Q_PROPERTY(int top READ top WRITE setTop NOTIFY topChanged)
@@ -135,7 +135,10 @@ public:
     bool hasFocus() const;
 
     qreal x() const;
+    void setX(qreal x);
+
     qreal y() const;
+    void setY(qreal y);
 
     qreal z() const;
     void setZ(qreal z);