GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 04:36:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '15.06' of https://github.com/Ultimaker/Cura into 15.06

Browse Source
This commit is contained in:
Tim Kuipers 2015-06-18 12:07:55 +02:00
commit 32b47ce192
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/qml/Toolbar.qml
View File

@ -18,6 +18,7 @@ Item {
id: activeItemBackground; id: activeItemBackground;
anchors.bottom: parent.bottom; anchors.bottom: parent.bottom;
anchors.bottomMargin: UM.Theme.sizes.default_margin.height;
width: UM.Theme.sizes.button.width; width: UM.Theme.sizes.button.width;
height: UM.Theme.sizes.button.height * 2; height: UM.Theme.sizes.button.height * 2;
@ -59,7 +60,6 @@ Item {
MouseArea { MouseArea {
anchors.fill: parent; anchors.fill: parent;
onClicked: parent.checked ? UM.Controller.setActiveTool(null) : UM.Controller.setActiveTool(model.id); onClicked: parent.checked ? UM.Controller.setActiveTool(null) : UM.Controller.setActiveTool(model.id);
} }
} }
} }
@ -72,7 +72,7 @@ Item {
anchors.bottom: buttons.top; anchors.bottom: buttons.top;
anchors.bottomMargin: UM.Theme.sizes.default_margin.height; anchors.bottomMargin: UM.Theme.sizes.default_margin.height;
width: panel.item ? panel.width + 2 * UM.Theme.sizes.default_margin.width : 0; width: panel.item ? Math.max(panel.width + 2 * UM.Theme.sizes.default_margin.width, activeItemBackground.x + activeItemBackground.width) : 0;
height: panel.item ? panel.height + 2 * UM.Theme.sizes.default_margin.height : 0; height: panel.item ? panel.height + 2 * UM.Theme.sizes.default_margin.height : 0;
opacity: panel.item ? 1 : 0 opacity: panel.item ? 1 : 0

7
resources/themes/cura/styles.qml
View File

@ -103,14 +103,19 @@ QtObject {
opacity: control.hovered ? 1.0 : 0.0; opacity: control.hovered ? 1.0 : 0.0;
Behavior on opacity { NumberAnimation { duration: 100; } } Behavior on opacity { NumberAnimation { duration: 100; } }
Rectangle {
anchors.horizontalCenter: parent.horizontalCenter;
width: childrenRect.width;
height: childrenRect.height;
Label { Label {
id: label id: label
anchors.horizontalCenter: parent.horizontalCenter;
text: control.text.replace("&", ""); text: control.text.replace("&", "");
font: UM.Theme.fonts.button_tooltip; font: UM.Theme.fonts.button_tooltip;
color: UM.Theme.colors.button_tooltip_text; color: UM.Theme.colors.button_tooltip_text;
} }
} }
}
UM.AngledCornerRectangle { UM.AngledCornerRectangle {
id: buttonFace; id: buttonFace;