3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-25 11:51:41 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Revert "makes the tooltip/label appear behind the button."

Browse source 
This reverts commit 62558f47fa.
This commit is contained in:
Arjen Hiemstra 2015-06-12 12:19:23 +02:00
parent 62558f47fa
commit aa0c18118b
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
resources/themes/cura/styles.qml
View file

@ -51,15 +51,14 @@ QtObject {
cornerSize: UM.Theme.sizes.default_margin.width; cornerSize: UM.Theme.sizes.default_margin.width;
Rectangle { Rectangle {
anchors.verticalCenter: parent.top; anchors.bottom: parent.top;
width: parent.width; width: parent.width;
height: control.hovered ? (label.height + 20) : 0; height: control.hovered ? label.height : 0;
Behavior on height { NumberAnimation { duration: 75; } } Behavior on height { NumberAnimation { duration: 75; } }
opacity: control.hovered ? 1.0 : 0.0; opacity: control.hovered ? 1.0 : 0.0;
Behavior on opacity { NumberAnimation { duration: 75; } } Behavior on opacity { NumberAnimation { duration: 75; } }
z: -1;
Label { Label {
id: label id: label
@ -107,16 +106,16 @@ QtObject {
} }
Behavior on color { ColorAnimation { duration: 50; } } Behavior on color { ColorAnimation { duration: 50; } }
cornerSize: UM.Theme.sizes.default_margin.width; cornerSize: UM.Theme.sizes.default_margin.width;
Rectangle { Rectangle {
anchors.verticalCenter: parent.top; anchors.bottom: parent.top;
width: parent.width; width: parent.width;
height: control.hovered ? (label.height + 20) : 0; height: control.hovered ? label.height : 0;
Behavior on height { NumberAnimation { duration: 75; } } Behavior on height { NumberAnimation { duration: 75; } }
opacity: control.hovered ? 1.0 : 0.0; opacity: control.hovered ? 1.0 : 0.0;
Behavior on opacity { NumberAnimation { duration: 75; } } Behavior on opacity { NumberAnimation { duration: 75; } }
z: -1;
Label { Label {
id: label id: label