diff options
| author | Eike Ziller <[email protected]> | 2023-03-29 12:21:50 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2023-03-29 12:21:50 +0200 |
| commit | b36287731eb8ab3895a1e7e19f071009dd1c1ad4 (patch) | |
| tree | 4a9999b27058b8efee4ed74cd40f4f16dd97b34f /src/libs/tracing | |
| parent | 6ab923c39fd4ac66edb3cf708e3c789cb4a31428 (diff) | |
| parent | 81a5e2143cb7728316e02d24925f853e2db2099a (diff) | |
Merge remote-tracking branch 'origin/10.0'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
src/tools/perfparser
Change-Id: Ie5643100e0eb00e0933359dce320169b876f5634
Diffstat (limited to 'src/libs/tracing')
| -rw-r--r-- | src/libs/tracing/qml/CategoryLabel.qml | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/libs/tracing/qml/CategoryLabel.qml b/src/libs/tracing/qml/CategoryLabel.qml index 4226195cbba..58704aa175a 100644 --- a/src/libs/tracing/qml/CategoryLabel.qml +++ b/src/libs/tracing/qml/CategoryLabel.qml @@ -174,9 +174,10 @@ Item { id: dragger property int visualIndex: labelContainer.visualIndex width: labelContainer.width - height: 0 + height: labelContainer.height color: Theme.color(Theme.PanelStatusBarBackgroundColor) opacity: 0.5 + visible: Drag.active anchors.left: parent.left // anchor to top so that it reliably snaps back after dragging @@ -184,16 +185,13 @@ Item { Drag.active: dragArea.drag.active Drag.onActiveChanged: { - // We don't want height or text to be changed when reordering occurs, so we don't make - // them properties. + // We don't want text to be changed when reordering occurs, so we don't make + // it a property draggerText.text = txt.text; - if (Drag.active) { - height = labelContainer.height; + if (Drag.active) labelContainer.dragStarted(); - } else { - height = 0; + else labelContainer.dragStopped(); - } } states: [ |