3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 13:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Make sure monitor buttons do not extend sidebar

Browse source
This commit is contained in:
fieldOfView 2017-10-29 10:07:42 +01:00
parent 208d365d51
commit 6a0ba43508
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
resources/qml/MonitorButton.qml
View file

@ -185,17 +185,20 @@ Item
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width; anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width;
} }
Row { Item {
id: buttonsRow id: buttonsRow
height: abortButton.height height: abortButton.height
width: Math.min(childrenRect.width, base.width - 2 * UM.Theme.getSize("sidebar_margin").width)
anchors.top: progressBar.bottom anchors.top: progressBar.bottom
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
spacing: UM.Theme.getSize("default_margin").width clip: true
Row { Row {
id: additionalComponentsRow id: additionalComponentsRow
anchors.right: pauseResumeButton.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width
spacing: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").width
} }
@ -215,6 +218,8 @@ Item
{ {
id: pauseResumeButton id: pauseResumeButton
anchors.right: abortButton.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width
height: UM.Theme.getSize("save_button_save_to_button").height height: UM.Theme.getSize("save_button_save_to_button").height
property bool userClicked: false property bool userClicked: false
@ -261,6 +266,8 @@ Item
{ {
id: abortButton id: abortButton
anchors.right: parent.right
visible: printerConnected && Cura.MachineManager.printerOutputDevices[0].canAbort visible: printerConnected && Cura.MachineManager.printerOutputDevices[0].canAbort
enabled: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands && enabled: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands &&
(["paused", "printing", "pre_print"].indexOf(Cura.MachineManager.printerOutputDevices[0].jobState) >= 0) (["paused", "printing", "pre_print"].indexOf(Cura.MachineManager.printerOutputDevices[0].jobState) >= 0)