summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@theqtcompany.com>2016-02-04 15:59:22 +0100
committerAlessandro Portale <alessandro.portale@theqtcompany.com>2016-02-10 14:07:12 +0000
commit7db0023e8c97336e0e449552410de674bbe2ffd0 (patch)
tree7ba53ef50aae854d0ca00e8a924058fe2e196453 /share
parent6980ccf8e1b2564a2810e5ba148ecc55bced20b5 (diff)
downloadqt-creator-7db0023e8c97336e0e449552410de674bbe2ffd0.tar.gz
QmlDesigner: HighDpi fixes for some graphics
- Fresh arrow_down, which is used in many places - Fresh arrow_up and some tweaks in spinbox - Fresh graphics for "submenu", "expression and "placeholder" - Fresh graphics for checkbox indicator - Removed unused hover checkbox variants - Added pressed state for checkbox_tr - Removed radius of focus rectangle in the lineedit Change-Id: I710ec6ac8ebf86c85a155a812e581cca88845ce3 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml10
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml3
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/down-arrow.pngbin134 -> 113 bytes
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/down-arrow@2x.pngbin0 -> 142 bytes
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/expression.pngbin252 -> 265 bytes
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/expression@2x.pngbin0 -> 910 bytes
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/placeholder.pngbin112 -> 194 bytes
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/placeholder@2x.pngbin0 -> 282 bytes
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/submenu.pngbin198 -> 240 bytes
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/submenu@2x.pngbin0 -> 354 bytes
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/up-arrow.pngbin127 -> 105 bytes
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/up-arrow@2x.pngbin0 -> 133 bytes
12 files changed, 6 insertions, 7 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml
index a86053df8a..21ea119b36 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml
@@ -43,9 +43,8 @@ SpinBoxStyle {
opacity: styleData.upEnabled ? styleData.upPressed ? 0.5 : 1 : 0.5
Image {
source: "images/up-arrow.png"
- anchors.centerIn: parent
- anchors.verticalCenterOffset: 2
- anchors.horizontalCenterOffset: -2
+ x: 1
+ y: 5
}
}
@@ -55,9 +54,8 @@ SpinBoxStyle {
opacity: styleData.downEnabled ? styleData.downPressed ? 0.5 : 1 : 0.5
Image {
source: "images/down-arrow.png"
- anchors.centerIn: parent
- anchors.verticalCenterOffset: -1
- anchors.horizontalCenterOffset: -2
+ x: 1
+ y: 2.5 // Hack! Spinbox sets an non-int offset, somewhere
}
}
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml
index 952cbd3522..a0dc2f79fa 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml
@@ -127,7 +127,6 @@ Controls.TextField {
anchors.fill: parent
anchors.margins: -1
color: "transparent"
- radius: 4
opacity: 0.3
visible: control.activeFocus
}
@@ -179,6 +178,8 @@ Controls.TextField {
indicator: Item {
implicitWidth: 16
implicitHeight: 16
+ x: 7
+ y: 1
Image { source: "qrc:qmldesigner/images/checkbox_tr_" +
(control.checked ? "checked": "unchecked") +
(control.pressed ? "_pressed": "") + ".png" }
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/down-arrow.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/down-arrow.png
index e0767413e8..5780560f7d 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/down-arrow.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/down-arrow.png
Binary files differ
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/down-arrow@2x.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/down-arrow@2x.png
new file mode 100644
index 0000000000..684a03ab50
--- /dev/null
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/down-arrow@2x.png
Binary files differ
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/expression.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/expression.png
index 32b48a485d..93754ed8e2 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/expression.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/expression.png
Binary files differ
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/expression@2x.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/expression@2x.png
new file mode 100644
index 0000000000..560c7e2d5a
--- /dev/null
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/expression@2x.png
Binary files differ
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/placeholder.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/placeholder.png
index de4bf4068e..1321327dc4 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/placeholder.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/placeholder.png
Binary files differ
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/placeholder@2x.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/placeholder@2x.png
new file mode 100644
index 0000000000..abe5d8aa9a
--- /dev/null
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/placeholder@2x.png
Binary files differ
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/submenu.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/submenu.png
index 1ac3bd5357..4e7b548485 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/submenu.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/submenu.png
Binary files differ
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/submenu@2x.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/submenu@2x.png
new file mode 100644
index 0000000000..49d77d15f3
--- /dev/null
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/submenu@2x.png
Binary files differ
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/up-arrow.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/up-arrow.png
index 0f1df5ac3c..42934bfad0 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/up-arrow.png
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/up-arrow.png
Binary files differ
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/up-arrow@2x.png b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/up-arrow@2x.png
new file mode 100644
index 0000000000..455c36f2f5
--- /dev/null
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/images/up-arrow@2x.png
Binary files differ