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

Add a background to the tool additional controls

Browse Source 
This makes the actual text more visible and also
makes the link between active tool and active tool
controls more apparent.

Fixes #21
This commit is contained in:
Arjen Hiemstra 2015-06-08 16:40:09 +02:00
parent d9ad54cd0d
commit 478babff9a
2 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
resources/qml/Toolbar.qml
View File

@ -14,6 +14,23 @@ Item {
width: buttons.width; width: buttons.width;
height: buttons.height + panel.height; height: buttons.height + panel.height;
Rectangle {
id: activeItemBackground;
anchors.bottom: parent.bottom;
width: UM.Theme.sizes.button.width;
height: UM.Theme.sizes.button.height * 2;
opacity: panelBackground.opacity;
color: UM.Theme.colors.tool_panel_background
function setActive(new_x) {
x = new_x;
}
}
RowLayout { RowLayout {
id: buttons; id: buttons;
@ -34,6 +51,7 @@ Item {
checkable: true; checkable: true;
checked: model.active; checked: model.active;
onCheckedChanged: if (checked) activeItemBackground.setActive(x);
style: UM.Theme.styles.tool_button; style: UM.Theme.styles.tool_button;
@ -42,21 +60,35 @@ 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);
} }
} }
} }
} }
Loader { UM.AngledCornerRectangle {
id: panel id: panelBackground;
anchors.left: parent.left; anchors.left: parent.left;
anchors.right: parent.right;
anchors.bottom: buttons.top; anchors.bottom: buttons.top;
anchors.bottomMargin: UM.Theme.sizes.default_margin.height; anchors.bottomMargin: UM.Theme.sizes.default_margin.height;
height: childrenRect.height; width: panel.item ? panel.width + 2 * UM.Theme.sizes.default_margin.width : 0;
height: panel.item ? panel.height + 2 * UM.Theme.sizes.default_margin.height : 0;
source: UM.ActiveTool.valid ? UM.ActiveTool.activeToolPanel : ""; opacity: panel.item ? 1 : 0
Behavior on opacity { NumberAnimation { duration: 100 } }
color: UM.Theme.colors.tool_panel_background;
cornerSize: width > 0 ? UM.Theme.sizes.default_margin.width : 0;
Loader {
id: panel
x: UM.Theme.sizes.default_margin.width;
y: UM.Theme.sizes.default_margin.height;
source: UM.ActiveTool.valid ? UM.ActiveTool.activeToolPanel : "";
}
} }
} }

4
resources/themes/cura/theme.json
View File

@ -110,7 +110,9 @@
"save_button_text": [35, 35, 35, 255], "save_button_text": [35, 35, 35, 255],
"message": [205, 202, 201, 255], "message": [205, 202, 201, 255],
"message_text": [35, 35, 35, 255] "message_text": [35, 35, 35, 255],
"tool_panel_background": [255, 255, 255, 255]
}, },
"sizes": { "sizes": {