diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-05-31 11:14:15 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-05-31 10:11:48 +0000 |
| commit | af986c40a3fe178e5379dc82d8bfb5c7e316d2e0 (patch) | |
| tree | a2fcf222138f150bba036c32315d7253650488db | |
| parent | aee9cde1602d8360685b0ea60bd69cce24f7e18a (diff) | |
| download | qt-creator-af986c40a3fe178e5379dc82d8bfb5c7e316d2e0.tar.gz | |
Tracing: Fix layout of RangeDetails
Only calculate the minimum width once all the children have been
positioned, round up the label width, and disable elision on labels.
Change-Id: Ia0ff6d5a08af2a5ceefd825fbe487a1d9969967d
Task-number: QTCREATORBUG-20502
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| -rw-r--r-- | src/libs/tracing/qml/Detail.qml | 2 | ||||
| -rw-r--r-- | src/libs/tracing/qml/RangeDetails.qml | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/libs/tracing/qml/Detail.qml b/src/libs/tracing/qml/Detail.qml index a1cbe86f10..a8ba0244c8 100644 --- a/src/libs/tracing/qml/Detail.qml +++ b/src/libs/tracing/qml/Detail.qml @@ -30,6 +30,6 @@ TimelineText { property int valueWidth: 170 property int labelWidth: implicitWidth font.bold: isLabel - elide: Text.ElideRight + elide: isLabel ? Text.ElideNone : Text.ElideRight width: isLabel ? labelWidth : valueWidth } diff --git a/src/libs/tracing/qml/RangeDetails.qml b/src/libs/tracing/qml/RangeDetails.qml index 22d5811f48..ccb86a5c3c 100644 --- a/src/libs/tracing/qml/RangeDetails.qml +++ b/src/libs/tracing/qml/RangeDetails.qml @@ -23,7 +23,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.9 import TimelineTheme 1.0 Item { @@ -153,7 +153,9 @@ Item { spacing: innerMargin columns: 2 - property int minimumWidth: { + + property int minimumWidth: minimumInnerWidth + onPositioningComplete: { // max(width of longest label * 2, minimumInnerWidth) var result = minimumInnerWidth; for (var i = 0; i < children.length; ++i) { @@ -161,10 +163,10 @@ Item { result = Math.max(children[i].implicitWidth * 2 + innerMargin, result); } - return result + 2 * outerMargin; + minimumWidth = result + 2 * outerMargin; } - property int labelWidth: (minimumWidth - innerMargin) / 2 - outerMargin + property int labelWidth: Math.ceil((minimumWidth - innerMargin) / 2) - outerMargin property int valueWidth: dragHandle.x - labelWidth - innerMargin - outerMargin onMinimumWidthChanged: { |