3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 23:05:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

15.10 re-alignment of the toolbar

Browse source 
This is a test to be reviewed

Contributes to: issue CURA-60
This commit is contained in:
Tamara Hogenhout 2015-08-27 14:59:33 +02:00
parent 26c46eb56a
commit 3d5f4e6bd6
3 changed files with 29 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
resources/qml/Cura.qml
View file

@ -304,9 +304,12 @@ UM.MainWindow {
id: toolbar;
anchors {
horizontalCenter: parent.horizontalCenter
horizontalCenterOffset: -(UM.Theme.sizes.sidebar.width / 2)
top: parent.top;
left: parent.left
top: parent.top
topMargin: 74
//horizontalCenter: parent.horizontalCenter
//horizontalCenterOffset: -(UM.Theme.sizes.sidebar.width / 2)
//top: parent.top;
}
}

27
resources/qml/Toolbar.qml
View file

@ -13,8 +13,9 @@ Item {
width: buttons.width;
height: buttons.height
property int activeY
RowLayout {
ColumnLayout {
id: buttons;
anchors.bottom: parent.bottom;
@ -39,26 +40,30 @@ Item {
//just catch the click so we do not trigger that behaviour.
MouseArea {
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);
base.activeY = parent.y
}
}
}
}
}
Rectangle {
width: base.width - 10
height: base.height
z: parent.z - 1
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
color: UM.Theme.colors.lining
}
width: base.width
height: base.height
z: parent.z - 1
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
color: UM.Theme.colors.lining
}
Rectangle {
id: panelBackground;
anchors.left: parent.left;
anchors.top: buttons.bottom;
anchors.left: parent.right;
y: base.activeY
width: panel.item ? Math.max(panel.width + 2 * UM.Theme.sizes.default_margin.width) : 0;
height: panel.item ? panel.height + 2 * UM.Theme.sizes.default_margin.height : 0;

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

@ -67,11 +67,14 @@ QtObject {
Rectangle {
id: tool_button_background
anchors.top: parent.bottom
anchors.left: parent.right
anchors.verticalCenter: parent.verticalCenter
//anchors.top: parent.bottom
width: label.width > parent.width ? label.width : parent.width
height: control.hovered ? label.height : 0;
Behavior on height { NumberAnimation { duration: 100; } }
//width: label.width > parent.width ? label.width : parent.width
width: control.hovered ? label.width : 0;
height: label.height
Behavior on width { NumberAnimation { duration: 100; } }
opacity: control.hovered ? 1.0 : 0.0;
Behavior on opacity { NumberAnimation { duration: 100; } }