Merge branch 'fix_layerview_box_width' of https://github.com/fieldOfView/Cura into fieldOfView-fix_layerview_box_width

This commit is contained in:
Ghostkeeper 2017-10-02 17:02:46 +02:00
commit d9906caf05
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75

View File

@ -1,7 +1,7 @@
// Copyright (c) 2017 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
import QtQuick 2.4
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.1
import QtQuick.Controls.Styles 1.1
@ -602,7 +602,7 @@ Item
anchors.leftMargin: UM.Theme.getSize("default_margin").width / 2;
anchors.verticalCenter: parent.verticalCenter;
width: Math.max(UM.Theme.getSize("line").width * maxValue.length + 2 * screenScaleFactor, 20 * screenScaleFactor);
width: fontMetrics.averageCharacterWidth * (maxValue.length) + UM.Theme.getSize("default_margin").width;
style: TextFieldStyle
{
textColor: UM.Theme.getColor("setting_control_text");
@ -630,4 +630,9 @@ Item
}
}
}
FontMetrics {
id: fontMetrics
font: UM.Theme.getFont("default")
}
}