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

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

Browse Source
This commit is contained in:
Jaime van Kessel 2018-12-14 13:23:43 +01:00
commit c4a0f19d56
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/qml/ActionPanel/OutputProcessWidget.qml
View File

@ -41,7 +41,7 @@ Column
{ {
left: parent.left left: parent.left
right: printInformationPanel.left right: printInformationPanel.left
rightMargin: UM.Theme.getSize("thin_margin").height rightMargin: printInformationPanel.visible ? UM.Theme.getSize("thin_margin").width : 0
} }
Cura.IconWithText Cura.IconWithText

2
resources/qml/ActionPanel/PrintInformationWidget.qml
View File

@ -12,7 +12,7 @@ UM.RecolorImage
id: widget id: widget
source: UM.Theme.getIcon("info") source: UM.Theme.getIcon("info")
width: UM.Theme.getSize("section_icon").width width: visible ? UM.Theme.getSize("section_icon").width : 0
height: UM.Theme.getSize("section_icon").height height: UM.Theme.getSize("section_icon").height
color: UM.Theme.getColor("icon") color: UM.Theme.getColor("icon")

2
resources/qml/MainWindow/MainWindowHeader.qml
View File

@ -54,7 +54,7 @@ Item
{ {
text: model.name.toUpperCase() text: model.name.toUpperCase()
checkable: true checkable: true
checked: UM.Controller.activeStage != null ? model.id == UM.Controller.activeStage.stageId : false checked: UM.Controller.activeStage !== null && model.id == UM.Controller.activeStage.stageId
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
exclusiveGroup: mainWindowHeaderMenuGroup exclusiveGroup: mainWindowHeaderMenuGroup