3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

resolve conflict

Browse source
This commit is contained in:
Mark 2018-02-09 11:30:56 +01:00
parent e7e476cb15
commit b52bf6decf
17 changed files with 75 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/Settings/SettingCategory.qml
View file

@ -193,7 +193,7 @@ Button
anchors {
right: inheritButton.visible ? inheritButton.left : parent.right
// use 1.9 as the factor because there is a 0.1 difference between the settings and inheritance warning icons
rightMargin: inheritButton.visible ? UM.Theme.getSize("default_margin").width / 2 : category_arrow.width + UM.Theme.getSize("default_margin").width * 1.9
rightMargin: inheritButton.visible ? Math.floor(UM.Theme.getSize("default_margin").width / 2) : category_arrow.width + Math.floor(UM.Theme.getSize("default_margin").width * 1.9)
verticalCenter: parent.verticalCenter
}
@ -231,7 +231,7 @@ Button
return false
}
height: parent.height / 2
height: Math.floor(parent.height / 2)
width: height
onClicked:

4
resources/qml/Settings/SettingCheckBox.qml
View file

@ -118,8 +118,8 @@ SettingItem
UM.RecolorImage {
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
width: parent.width / 2.5
height: parent.height / 2.5
width: Math.floor(parent.width / 2.5)
height: Math.floor(parent.height / 2.5)
sourceSize.width: width
sourceSize.height: width
color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text");

2
resources/qml/Settings/SettingComboBox.qml
View file

@ -61,7 +61,7 @@ SettingItem
{
id: downArrow
x: control.width - width - control.rightPadding
y: control.topPadding + (control.availableHeight - height) / 2
y: control.topPadding + Math.floor((control.availableHeight - height) / 2)
source: UM.Theme.getIcon("arrow_bottom")
width: UM.Theme.getSize("standard_arrow").width

12
resources/qml/Settings/SettingExtruder.qml
View file

@ -126,16 +126,16 @@ SettingItem
background: Rectangle
{
id: swatch
height: UM.Theme.getSize("setting_control").height / 2
height: Math.floor(UM.Theme.getSize("setting_control").height / 2)
width: height
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.margins: UM.Theme.getSize("default_margin").width / 4
anchors.margins: Math.floor(UM.Theme.getSize("default_margin").width / 4)
border.width: UM.Theme.getSize("default_lining").width
border.color: enabled ? UM.Theme.getColor("setting_control_border") : UM.Theme.getColor("setting_control_disabled_border")
radius: width / 2
radius: Math.floor(width / 2)
color: control.color
}
@ -180,16 +180,16 @@ SettingItem
background: Rectangle
{
id: swatch
height: UM.Theme.getSize("setting_control").height / 2
height: Math.floor(UM.Theme.getSize("setting_control").height / 2)
width: height
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.margins: UM.Theme.getSize("default_margin").width / 4
anchors.margins: Math.floor(UM.Theme.getSize("default_margin").width / 4)
border.width: UM.Theme.getSize("default_lining").width
border.color: enabled ? UM.Theme.getColor("setting_control_border") : UM.Theme.getColor("setting_control_disabled_border")
radius: width / 2
radius: Math.floor(width / 2)
color: control.model.getItem(index).color
}

6
resources/qml/Settings/SettingItem.qml
View file

@ -128,12 +128,12 @@ Item {
{
id: settingControls
height: parent.height / 2
spacing: UM.Theme.getSize("sidebar_margin").height / 2
height: Math.floor(parent.height / 2)
spacing: Math.floor(UM.Theme.getSize("sidebar_margin").height / 2)
anchors {
right: controlContainer.left
rightMargin: UM.Theme.getSize("sidebar_margin").width / 2
rightMargin: Math.floor(UM.Theme.getSize("sidebar_margin").width / 2)
verticalCenter: parent.verticalCenter
}

14
resources/qml/Settings/SettingOptionalExtruder.qml
View file

@ -87,7 +87,7 @@ SettingItem
{
id: downArrow
x: control.width - width - control.rightPadding
y: control.topPadding + (control.availableHeight - height) / 2
y: control.topPadding + Math.floor((control.availableHeight - height) / 2)
source: UM.Theme.getIcon("arrow_bottom")
width: UM.Theme.getSize("standard_arrow").width
@ -145,16 +145,16 @@ SettingItem
background: Rectangle
{
id: swatch
height: UM.Theme.getSize("setting_control").height / 2
height: Math.floor(UM.Theme.getSize("setting_control").height / 2)
width: height
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.margins: UM.Theme.getSize("default_margin").width / 4
anchors.margins: Math.floor(UM.Theme.getSize("default_margin").width / 4)
border.width: UM.Theme.getSize("default_lining").width
border.color: enabled ? UM.Theme.getColor("setting_control_border") : UM.Theme.getColor("setting_control_disabled_border")
radius: width / 2
radius: Math.floor(width / 2)
color: control.color
}
@ -199,16 +199,16 @@ SettingItem
background: Rectangle
{
id: swatch
height: UM.Theme.getSize("setting_control").height / 2
height: Math.floor(UM.Theme.getSize("setting_control").height / 2)
width: height
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.margins: UM.Theme.getSize("default_margin").width / 4
anchors.margins: Math.floor(UM.Theme.getSize("default_margin").width / 4)
border.width: UM.Theme.getSize("default_lining").width
border.color: enabled ? UM.Theme.getColor("setting_control_border") : UM.Theme.getColor("setting_control_disabled_border")
radius: width / 2
radius: Math.floor(width / 2)
color: control.model.getItem(index).color
}