From 9323012507b8c3b86f9b2cd14a29a71bf09b62db Mon Sep 17 00:00:00 2001 From: deepin-ci-robot Date: Mon, 23 Sep 2024 03:41:29 +0000 Subject: [PATCH] sync: from linuxdeepin/dtkdeclarative Synchronize source files from linuxdeepin/dtkdeclarative. Source-pull-request: https://github.com/linuxdeepin/dtkdeclarative/pull/399 --- qt6/src/qml/ToolTip.qml | 2 +- src/private/dquickbackdropblitter.cpp | 4 ---- src/qml/ToolTip.qml | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/qt6/src/qml/ToolTip.qml b/qt6/src/qml/ToolTip.qml index 4421f091..99c4beca 100644 --- a/qt6/src/qml/ToolTip.qml +++ b/qt6/src/qml/ToolTip.qml @@ -27,7 +27,7 @@ T.ToolTip { verticalAlignment: Text.AlignVCenter text: control.text font: control.font - wrapMode: Text.WordWrap + wrapMode: Text.Wrap opacity: enabled ? 1.0 : 0.4 color: control.palette.toolTipText } diff --git a/src/private/dquickbackdropblitter.cpp b/src/private/dquickbackdropblitter.cpp index 646c12e5..8fb6929e 100644 --- a/src/private/dquickbackdropblitter.cpp +++ b/src/private/dquickbackdropblitter.cpp @@ -276,10 +276,6 @@ QSGNode *DQuickBackdropBlitter::updatePaintNode(QSGNode *oldNode, QQuickItem::Up node->setContentItem(d->container); node->setTextureChangedCallback(onTextureChanged, d); - connect(this, &QObject::destroyed, this, [node](){ - // fix callback crashed... - node->setTextureChangedCallback(nullptr, nullptr); - }); node->resize(size()); onTextureChanged(node, d); diff --git a/src/qml/ToolTip.qml b/src/qml/ToolTip.qml index 826687e8..1b6fcbbd 100644 --- a/src/qml/ToolTip.qml +++ b/src/qml/ToolTip.qml @@ -27,7 +27,7 @@ T.ToolTip { verticalAlignment: Text.AlignVCenter text: control.text font: control.font - wrapMode: Text.WordWrap + wrapMode: Text.Wrap opacity: enabled ? 1.0 : 0.4 color: control.palette.toolTipText }