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

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

Browse Source
This commit is contained in:
Jaime van Kessel 2016-02-04 12:01:54 +01:00
commit c5c90ba66e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View File

@ -202,6 +202,7 @@ Item {
width: parent.width;
height: childrenRect.height;
visible: model.visible && settingsColumn.height != 0 //If all children are hidden, the height is 0, and then the category header must also be hidden.
ToolButton {
id: categoryHeader;
@ -237,8 +238,6 @@ Item {
property variant settingsModel: model.settings;
visible: model.visible;
Column {
id: settingsColumn;
@ -272,6 +271,8 @@ Item {
x: model.depth * UM.Theme.sizes.default_margin.width;
text: model.name;
tooltip: model.description;
visible: !model.global_only
height: model.global_only ? 0 : undefined
onClicked: {
var object_id = UM.ActiveTool.properties.Model.getItem(base.currentIndex).id;