mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-23 14:44:13 -06:00
Forgotten sidebar margins
The buttons need the sidebar margins too. Contributes to issue CURA-4148.
This commit is contained in:
parent
09a5cf1de2
commit
cdf43ea6a4
2 changed files with 20 additions and 20 deletions
|
@ -1,4 +1,4 @@
|
|||
// Copyright (c) 2016 Ultimaker B.V.
|
||||
// Copyright (c) 2017 Ultimaker B.V.
|
||||
// Cura is released under the terms of the AGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.2
|
||||
|
@ -119,10 +119,10 @@ Item
|
|||
Label
|
||||
{
|
||||
id: statusLabel
|
||||
width: parent.width - 2 * UM.Theme.getSize("default_margin").width
|
||||
width: parent.width - 2 * UM.Theme.getSize("sidebar_margin").width
|
||||
anchors.top: parent.top
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
|
||||
color: base.statusColor
|
||||
font: UM.Theme.getFont("large")
|
||||
|
@ -177,21 +177,21 @@ Item
|
|||
property string backgroundColor: UM.Theme.getColor("progressbar_background");
|
||||
property string controlColor: base.statusColor;
|
||||
|
||||
width: parent.width - 2 * UM.Theme.getSize("default_margin").width;
|
||||
width: parent.width - 2 * UM.Theme.getSize("sidebar_margin").width;
|
||||
height: UM.Theme.getSize("progressbar").height;
|
||||
anchors.top: statusLabel.bottom;
|
||||
anchors.topMargin: UM.Theme.getSize("default_margin").height / 4;
|
||||
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height / 4;
|
||||
anchors.left: parent.left;
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width;
|
||||
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width;
|
||||
}
|
||||
|
||||
Row {
|
||||
id: buttonsRow
|
||||
height: abortButton.height
|
||||
anchors.top: progressBar.bottom
|
||||
anchors.topMargin: UM.Theme.getSize("default_margin").height
|
||||
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
||||
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
|
||||
spacing: UM.Theme.getSize("default_margin").width
|
||||
|
||||
Row {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue