feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner.StatesEditor: Adjust margins

Browse Source 
The "magic" -2 keeps the margins symmetric.
The states editor now nearly looks like the blog post proposal.
Only the highlight color is different, but already comes from the
theming engine.

Change-Id: Ibae5a3f19a7b07063ea44933498c24519bd34e94
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Thomas Hartmann
2016-07-01 18:36:58 +02:00
parent 0f46ad9cb1
commit a12184ea32
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml
View File

@@ -105,12 +105,14 @@ Rectangle {
Item { Item {
id: stateImageArea id: stateImageArea
anchors.topMargin: 1 anchors.topMargin: 4
anchors.left: stateNameField.left anchors.left: stateNameField.left
anchors.top: stateNameField.bottom anchors.top: stateNameField.bottom
height: delegateStateImageSize + 2 height: delegateStateImageSize + 2
width: delegateStateImageSize + 2 width: delegateStateImageSize + 2
visible: expanded
Rectangle { Rectangle {
anchors.margins: -1 anchors.margins: -1
anchors.fill: stateImage anchors.fill: stateImage

4
share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml
View File

@@ -31,7 +31,7 @@ import "../common"
FocusScope { FocusScope {
id: root id: root
height: expanded ? 136 : 32 height: expanded ? 136 : 30
signal createNewState signal createNewState
signal deleteState(int internalNodeId) signal deleteState(int internalNodeId)
signal duplicateCurrentState signal duplicateCurrentState
@@ -39,7 +39,7 @@ FocusScope {
property int stateImageSize: 100 property int stateImageSize: 100
property int delegateWidth: stateImageSize + 10 property int delegateWidth: stateImageSize + 10
property int padding: 2 property int padding: 2
property int delegateHeight: root.height - padding * 2 property int delegateHeight: root.height - padding * 2 + 1
property int innerSpacing: -1 property int innerSpacing: -1
property int currentStateInternalId : 0 property int currentStateInternalId : 0