3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 06:45:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

32
resources/themes/cura-light/styles.qml
View file

@ -268,7 +268,7 @@ QtObject {
anchors.leftMargin: Theme.getSize("button_tooltip_arrow").width * 2
anchors.verticalCenter: parent.verticalCenter
target: Qt.point(parent.x, y + height/2)
target: Qt.point(parent.x, y + Math.floor(height/2))
arrowSize: Theme.getSize("button_tooltip_arrow").width
color: Theme.getColor("button_tooltip")
opacity: control.hovered ? 1.0 : 0.0;
@ -712,14 +712,14 @@ QtObject {
scrollBarBackground: Rectangle {
implicitWidth: Theme.getSize("scrollbar").width
radius: implicitWidth / 2
radius: Math.floor(implicitWidth / 2)
color: Theme.getColor("scrollbar_background");
}
handle: Rectangle {
id: scrollViewHandle
implicitWidth: Theme.getSize("scrollbar").width;
radius: implicitWidth / 2
radius: Math.floor(implicitWidth / 2)
color: styleData.pressed ? Theme.getColor("scrollbar_handle_down") : styleData.hovered ? Theme.getColor("scrollbar_handle_hover") : Theme.getColor("scrollbar_handle");
Behavior on color { ColorAnimation { duration: 50; } }
@ -806,12 +806,12 @@ QtObject {
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: downArrow.left
anchors.verticalCenter: parent.verticalCenter
anchors.margins: UM.Theme.getSize("default_margin").width / 4
radius: width / 2
anchors.margins: Math.floor(UM.Theme.getSize("default_margin").width / 4)
radius: Math.floor(width / 2)
border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("lining")
color: (control.color_override !== "") ? control.color_override : control.color
@ -845,7 +845,7 @@ QtObject {
color: (control.hovered || control._hovered) ? Theme.getColor("checkbox_hover") : Theme.getColor("checkbox");
Behavior on color { ColorAnimation { duration: 50; } }
radius: control.exclusiveGroup ? Theme.getSize("checkbox").width / 2 : 0
radius: control.exclusiveGroup ? Math.floor(Theme.getSize("checkbox").width / 2) : 0
border.width: Theme.getSize("default_lining").width;
border.color: (control.hovered || control._hovered) ? Theme.getColor("checkbox_border_hover") : Theme.getColor("checkbox_border");
@ -853,8 +853,8 @@ QtObject {
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: Theme.getColor("checkbox_mark")
@ -882,7 +882,7 @@ QtObject {
color: (control.hovered || control._hovered) ? Theme.getColor("checkbox_hover") : Theme.getColor("checkbox");
Behavior on color { ColorAnimation { duration: 50; } }
radius: control.exclusiveGroup ? Theme.getSize("checkbox").width / 2 : 0
radius: control.exclusiveGroup ? Math.floor(Theme.getSize("checkbox").width / 2) : 0
border.width: Theme.getSize("default_lining").width;
border.color: (control.hovered || control._hovered) ? Theme.getColor("checkbox_border_hover") : Theme.getColor("checkbox_border");
@ -890,8 +890,8 @@ QtObject {
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: Theme.getColor("checkbox_mark")
@ -925,7 +925,7 @@ QtObject {
border.width: Theme.getSize("default_lining").width;
border.color: Theme.getColor("slider_groove_border");
radius: width / 2;
radius: Math.floor(width / 2);
Rectangle {
anchors {
@ -934,8 +934,8 @@ QtObject {
bottom: parent.bottom;
}
color: Theme.getColor("slider_groove_fill");
width: (control.value / (control.maximumValue - control.minimumValue)) * parent.width;
radius: width / 2;
width: Math.floor((control.value / (control.maximumValue - control.minimumValue)) * parent.width);
radius: Math.floor(width / 2);
}
}
handle: Rectangle {
@ -944,7 +944,7 @@ QtObject {
color: control.hovered ? Theme.getColor("slider_handle_hover") : Theme.getColor("slider_handle");
border.width: Theme.getSize("default_lining").width
border.color: control.hovered ? Theme.getColor("slider_handle_hover_border") : Theme.getColor("slider_handle_border")
radius: Theme.getSize("slider_handle").width / 2; //Round.
radius: Math.floor(Theme.getSize("slider_handle").width / 2); //Round.
Behavior on color { ColorAnimation { duration: 50; } }
}
}