From bbe5405a4bc4fc6b92063d78ca7c971f84d473da Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Tue, 19 Jul 2011 17:38:48 +0200
Subject: [PATCH] QmlDesigner.propertyEditor: Mac fixes
Fixes expression editor on Mac.
The button are properly clickable now.
Change-Id: Ib886abad0237c22e72bfdc4099d329a1279d01e8
Reviewed-on: http://codereview.qt.nokia.com/1841
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
---
.../qmldesigner/propertyeditor/Qt/ExpressionEditor.qml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml
index ed4d021589d..e3cc06de82c 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml
@@ -80,8 +80,8 @@ QWidget {
styleSheet: "QTextEdit {border-radius: 0px;}"
documentTitle: qsTr("Expression")
- width: expressionEdit.width
- height: expressionEdit.height
+ width: expressionEdit.width - 10
+ height: expressionEdit.height - 10
horizontalScrollBarPolicy: "Qt::ScrollBarAlwaysOff"
verticalScrollBarPolicy: "Qt::ScrollBarAlwaysOff"
@@ -97,19 +97,19 @@ QWidget {
QPushButton {
focusPolicy: "Qt::NoFocus";
y: expressionEdit.height - 22;
- x: expressionEdit.width - 61;
+ x: expressionEdit.width - 59;
styleSheetFile: "applybutton.css";
width: 29
height: 19
onClicked: {
expressionEdit.backendValue.expression = textEdit.plainText;
expressionEdit.active = false;
- }
+ }
}
QPushButton {
focusPolicy: "Qt::NoFocus";
y: expressionEdit.height - 22;
- x: expressionEdit.width - 32;
+ x: expressionEdit.width - 30;
styleSheetFile: "cancelbutton.css";
width: 29
height: 19
--
GitLab