From aa0c18118b0d258b43cb617a206ce57101aa88ea Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Fri, 12 Jun 2015 12:19:23 +0200 Subject: [PATCH] Revert "makes the tooltip/label appear behind the button." This reverts commit 62558f47fafb9d783388238011f8fca938ffe145. --- resources/themes/cura/styles.qml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/resources/themes/cura/styles.qml b/resources/themes/cura/styles.qml index cd66a79257..e6c08b381c 100644 --- a/resources/themes/cura/styles.qml +++ b/resources/themes/cura/styles.qml @@ -51,15 +51,14 @@ QtObject { cornerSize: UM.Theme.sizes.default_margin.width; Rectangle { - anchors.verticalCenter: parent.top; + anchors.bottom: parent.top; width: parent.width; - height: control.hovered ? (label.height + 20) : 0; + height: control.hovered ? label.height : 0; Behavior on height { NumberAnimation { duration: 75; } } opacity: control.hovered ? 1.0 : 0.0; Behavior on opacity { NumberAnimation { duration: 75; } } - z: -1; Label { id: label @@ -107,16 +106,16 @@ QtObject { } Behavior on color { ColorAnimation { duration: 50; } } cornerSize: UM.Theme.sizes.default_margin.width; + Rectangle { - anchors.verticalCenter: parent.top; + anchors.bottom: parent.top; width: parent.width; - height: control.hovered ? (label.height + 20) : 0; + height: control.hovered ? label.height : 0; Behavior on height { NumberAnimation { duration: 75; } } opacity: control.hovered ? 1.0 : 0.0; Behavior on opacity { NumberAnimation { duration: 75; } } - z: -1; Label { id: label