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

Changed parseInt to Math.floor

Browse source
This commit is contained in:
Mark 2017-10-11 16:47:40 +02:00
parent d9c7a211c1
commit eaa7b75f0e
7 changed files with 64 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

28
resources/qml/SidebarHeader.qml
View file

@ -17,7 +17,7 @@ Column
property int currentExtruderIndex: ExtruderManager.activeExtruderIndex;
property bool currentExtruderVisible: extrudersList.visible;
spacing: UM.Theme.getSize("sidebar_margin").width * 0.9
spacing: Math.floor(UM.Theme.getSize("sidebar_margin").width * 0.9)
signal showTooltip(Item item, point location, string text)
signal hideTooltip()
@ -52,15 +52,15 @@ Column
{
id: extruderSelectionRow
width: parent.width
height: UM.Theme.getSize("sidebar_tabs").height * 2 / 3
height: Math.floor(UM.Theme.getSize("sidebar_tabs").height * 2 / 3)
visible: machineExtruderCount.properties.value > 1 && !sidebar.monitoringPrint
anchors
{
left: parent.left
leftMargin: UM.Theme.getSize("sidebar_margin").width * 0.7
leftMargin: Math.floor(UM.Theme.getSize("sidebar_margin").width * 0.7)
right: parent.right
rightMargin: UM.Theme.getSize("sidebar_margin").width * 0.7
rightMargin: Math.floor(UM.Theme.getSize("sidebar_margin").width * 0.7)
topMargin: UM.Theme.getSize("sidebar_margin").height
}
@ -70,15 +70,15 @@ Column
property var index: 0
height: UM.Theme.getSize("sidebar_header_mode_tabs").height
width: parent.width
width: Math.floor(parent.width)
boundsBehavior: Flickable.StopAtBounds
anchors
{
left: parent.left
leftMargin: UM.Theme.getSize("default_margin").width / 2
leftMargin: Math.floor(UM.Theme.getSize("default_margin").width / 2)
right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width / 2
rightMargin: Math.floor(UM.Theme.getSize("default_margin").width / 2)
verticalCenter: parent.verticalCenter
}
@ -134,7 +134,7 @@ Column
width: {
var extruderTextWidth = extruderStaticText.visible ? extruderStaticText.width : 0;
var iconWidth = extruderIconItem.width;
return parseInt(extruderTextWidth + iconWidth + UM.Theme.getSize("default_margin").width / 2);
return Math.floor(extruderTextWidth + iconWidth + UM.Theme.getSize("default_margin").width / 2);
}
// Static text "Extruder"
@ -166,7 +166,7 @@ Column
var minimumWidth = control.width < UM.Theme.getSize("button").width ? control.width : UM.Theme.getSize("button").width;
var minimumHeight = control.height < UM.Theme.getSize("button").height ? control.height : UM.Theme.getSize("button").height;
var minimumSize = minimumWidth < minimumHeight ? minimumWidth : minimumHeight;
minimumSize -= parseInt(UM.Theme.getSize("default_margin").width / 2);
minimumSize -= Math.floor(UM.Theme.getSize("default_margin").width / 2);
return minimumSize;
}
@ -254,7 +254,7 @@ Column
{
id: materialLabel
text: catalog.i18nc("@label","Material");
width: parseInt(parent.width * 0.45 - UM.Theme.getSize("default_margin").width)
width: Math.floor(parent.width * 0.45 - UM.Theme.getSize("default_margin").width)
font: UM.Theme.getFont("default");
color: UM.Theme.getColor("text");
}
@ -310,7 +310,7 @@ Column
{
id: printCoreLabel
text: Cura.MachineManager.activeDefinitionVariantsName;
width: parseInt(parent.width * 0.45 - UM.Theme.getSize("default_margin").width)
width: Math.floor(parent.width * 0.45 - UM.Theme.getSize("default_margin").width)
font: UM.Theme.getFont("default");
color: UM.Theme.getColor("text");
}
@ -322,7 +322,7 @@ Column
visible: Cura.MachineManager.hasVariants
height: UM.Theme.getSize("setting_control").height
width: parseInt(parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width)
width: Math.floor(parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width)
anchors.right: parent.right
style: UM.Theme.styles.sidebar_header_button
activeFocusOnPress: true;
@ -335,7 +335,7 @@ Column
Item
{
id: materialInfoRow
height: parseInt(UM.Theme.getSize("sidebar_setup").height / 2)
height: Math.floor(UM.Theme.getSize("sidebar_setup").height / 2)
visible: (Cura.MachineManager.hasVariants || Cura.MachineManager.hasMaterials) && !sidebar.monitoringPrint && !sidebar.hideSettings
anchors
@ -349,7 +349,7 @@ Column
Item {
height: UM.Theme.getSize("sidebar_setup").height
anchors.right: parent.right
width: parseInt(parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width)
width: Math.floor(parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width)
UM.RecolorImage {
id: warningImage