feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Prevent showing preview tooltip when button is pressed

Browse Source 
On some platforms, drag will stop deliving mouse events to MouseArea.
Disallowed showing the tooltip when a mouse button is pressed.

Fixes: QDS-6481
Change-Id: I8777d57be1bfef8470571027d9257d3a10eb5a7a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Miikka Heikkinen
2022-03-18 15:14:15 +02:00
parent e40041978e
commit 9a9cd6d62f
4 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml
View File

@@ -665,15 +665,23 @@ Item {
MouseArea {
id: mouseArea
property bool allowTooltip: true
anchors.fill: parent
hoverEnabled: true
acceptedButtons: Qt.LeftButton | Qt.RightButton
onExited: tooltipBackend.hideTooltip()
onCanceled: tooltipBackend.hideTooltip()
onEntered: allowTooltip = true
onCanceled: {
tooltipBackend.hideTooltip()
allowTooltip = true
}
onPositionChanged: tooltipBackend.reposition()
onPressed: (mouse)=> {
forceActiveFocus()
allowTooltip = false
tooltipBackend.hideTooltip()
var ctrlDown = mouse.modifiers & Qt.ControlModifier
if (mouse.button === Qt.LeftButton) {
if (!root.selectedAssets[filePath] && !ctrlDown)
@@ -698,12 +706,12 @@ Item {
root.contextDir = model.fileDir
root.isDirContextMenu = false
tooltipBackend.hideTooltip()
contextMenu.popup()
}
}
onReleased: (mouse)=> {
allowTooltip = true
if (mouse.button === Qt.LeftButton) {
if (!(mouse.modifiers & Qt.ControlModifier))
root.selectedAssets = {}
@@ -720,7 +728,7 @@ Item {
Timer {
interval: 1000
running: mouseArea.containsMouse
running: mouseArea.containsMouse && mouseArea.allowTooltip
onTriggered: {
if (suffix === ".ttf" || suffix === ".otf") {
tooltipBackend.name = fileName

2
share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml
View File

@@ -88,6 +88,8 @@ Item {
onShowContextMenu: delegateRoot.showContextMenu()
onPressed: (mouse)=> {
allowTooltip = false
hide()
if (mouse.button === Qt.LeftButton)
rootView.startDragAndDrop(itemLibraryEntry, mapToGlobal(mouse.x, mouse.y))
}

11
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ImagePreviewTooltipArea.qml
View File

@@ -30,6 +30,8 @@ import HelperWidgets 2.0
MouseArea {
id: mouseArea
property bool allowTooltip: true
signal showContextMenu()
function hide()
@@ -38,7 +40,12 @@ MouseArea {
}
onExited: tooltipBackend.hideTooltip()
onCanceled: tooltipBackend.hideTooltip()
onEntered: allowTooltip = true
onCanceled: {
tooltipBackend.hideTooltip()
allowTooltip = true
}
onReleased: allowTooltip = true
onPositionChanged: tooltipBackend.reposition()
onClicked: function(mouse) {
forceActiveFocus()
@@ -51,7 +58,7 @@ MouseArea {
Timer {
interval: 1000
running: mouseArea.containsMouse
running: mouseArea.containsMouse && mouseArea.allowTooltip
onTriggered: {
tooltipBackend.name = itemName
tooltipBackend.path = componentPath

9
src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp
View File

@@ -293,8 +293,15 @@ void NavigatorTreeView::mousePressEvent(QMouseEvent *event)
void NavigatorTreeView::startDrag(Qt::DropActions supportedActions)
{
if (m_dragAllowed)
if (m_dragAllowed) {
if (m_previewToolTip) {
// Workaround to ensure tooltip doesn't linger during drag, as drag grabs all mouse
// events on some platforms (e.g. mac)
m_previewToolTip->hide();
m_previewToolTipNodeId = -1;
}
QTreeView::startDrag(supportedActions);
}
}
}