QmlDesigner.propertyEditor: layout fixes for expression editing

Task-number: QTCREATORBUG-5045
Change-Id: Ie3ab670edef3aa82187ca0e4cfb1124218ff6a29
Reviewed-on: http://codereview.qt.nokia.com/1936
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml
index e3cc06d..3e6a865 100644 (file)
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml
@@ -35,7 +35,7 @@ import Bauhaus 1.0
 
 QWidget {
     id: expressionEditor;
-    x: 6
+    x: 16
     y: -400
     width: frame.width - 22
     height: 40

diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
index 317fcaa..7468dab 100644 (file)
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
@@ -108,8 +108,12 @@ AnimatedToolButton {
     QAction {
         text: qsTr("Set Expression");
         onTriggered: {
-            expressionEdit.globalY = extendedFunctionButton.globalY;
+            expressionEdit.globalY = extendedFunctionButton.globalY - 10;
             expressionEdit.backendValue = extendedFunctionButton.backendValue
+
+            if ((expressionEdit.y + expressionEdit.height + 20) > frame.height)
+                expressionEdit.y = frame.height - expressionEdit.height - 20
+
             expressionEdit.show();
             expressionEdit.raise();
             expressionEdit.active = true;