Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNino van Hooff <ninovanhooff@gmail.com>2019-11-12 16:52:11 +0300
committerNino van Hooff <ninovanhooff@gmail.com>2019-11-12 16:52:11 +0300
commitf4b9c0fdd47b70c2f70031a59dd6cb880bd58959 (patch)
treed7506c513c08ff6612c92060d7cc8afb23d2841a /plugins/SimulationView
parentae245ed0e58934ef6d44ff73d1eec20d8e3146e9 (diff)
Fix SimulationSliderLabel width
Diffstat (limited to 'plugins/SimulationView')
-rw-r--r--plugins/SimulationView/SimulationSliderLabel.qml14
1 files changed, 10 insertions, 4 deletions
diff --git a/plugins/SimulationView/SimulationSliderLabel.qml b/plugins/SimulationView/SimulationSliderLabel.qml
index 7474c287c2..5245c5e92a 100644
--- a/plugins/SimulationView/SimulationSliderLabel.qml
+++ b/plugins/SimulationView/SimulationSliderLabel.qml
@@ -1,7 +1,6 @@
// Copyright (c) 2017 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
-
-import QtQuick 2.2
+import QtQuick 2.5
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.1
import QtQuick.Controls.Styles 1.1
@@ -40,6 +39,13 @@ UM.PointingRectangle {
anchors.fill: parent
}
+ TextMetrics {
+ id: maxValueMetrics
+ font: UM.Theme.getFont("default")
+ text: maximumValue + 1 // layers are 0 based, add 1 for display value
+
+ }
+
TextField {
id: valueLabel
@@ -49,7 +55,6 @@ UM.PointingRectangle {
alignWhenCentered: false
}
- width: ((maximumValue + 1).toString().length + 1) * UM.Theme.getFont("default").pixelSize
text: sliderLabelRoot.value + startFrom // the current handle value, add 1 because layers is an array
horizontalAlignment: TextInput.AlignHCenter
@@ -61,7 +66,8 @@ UM.PointingRectangle {
textColor: UM.Theme.getColor("text")
font: UM.Theme.getFont("default")
renderType: Text.NativeRendering
- background: Item { }
+ // valueLabel width
+ background: Item { implicitWidth: maxValueMetrics.width + UM.Theme.getSize("default_margin").width }
}
onEditingFinished: {