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

QmlDesigner: Fix regression: Close context-menus on focus out

Browse Source 
Was broken by introducing StudioQuickWidget

Fixes: QDS-9468
Change-Id: Ie9a29af7356387591259fd2a3d1ae9adc34c711d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Mahmoud Badri
2023-03-27 16:12:45 +03:00
parent 4cb99eb737
commit bda4ae301b
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
View File

@@ -55,7 +55,7 @@ static QString propertyEditorResourcesPath()
bool AssetsLibraryWidget::eventFilter(QObject *obj, QEvent *event) bool AssetsLibraryWidget::eventFilter(QObject *obj, QEvent *event)
{ {
if (event->type() == QEvent::FocusOut) { if (event->type() == QEvent::FocusOut) {
if (obj == m_assetsWidget.data()) if (obj == m_assetsWidget->quickWidget())
QMetaObject::invokeMethod(m_assetsWidget->rootObject(), "handleViewFocusOut"); QMetaObject::invokeMethod(m_assetsWidget->rootObject(), "handleViewFocusOut");
} else if (event->type() == QMouseEvent::MouseMove) { } else if (event->type() == QMouseEvent::MouseMove) {
if (!m_assetsToDrag.isEmpty() && !m_model.isNull()) { if (!m_assetsToDrag.isEmpty() && !m_model.isNull()) {

2
src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp
View File

@@ -44,7 +44,7 @@ static QString propertyEditorResourcesPath()
bool ContentLibraryWidget::eventFilter(QObject *obj, QEvent *event) bool ContentLibraryWidget::eventFilter(QObject *obj, QEvent *event)
{ {
if (event->type() == QEvent::FocusOut) { if (event->type() == QEvent::FocusOut) {
if (obj == m_quickWidget.data()) if (obj == m_quickWidget->quickWidget())
QMetaObject::invokeMethod(m_quickWidget->rootObject(), "closeContextMenu"); QMetaObject::invokeMethod(m_quickWidget->rootObject(), "closeContextMenu");
} else if (event->type() == QMouseEvent::MouseMove) { } else if (event->type() == QMouseEvent::MouseMove) {
DesignDocument *document = QmlDesignerPlugin::instance()->currentDesignDocument(); DesignDocument *document = QmlDesignerPlugin::instance()->currentDesignDocument();

2
src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
View File

@@ -71,7 +71,7 @@ bool ItemLibraryWidget::eventFilter(QObject *obj, QEvent *event)
Model *model = document ? document->documentModel() : nullptr; Model *model = document ? document->documentModel() : nullptr;
if (event->type() == QEvent::FocusOut) { if (event->type() == QEvent::FocusOut) {
if (obj == m_itemsWidget.data()) if (obj == m_itemsWidget->quickWidget())
QMetaObject::invokeMethod(m_itemsWidget->rootObject(), "closeContextMenu"); QMetaObject::invokeMethod(m_itemsWidget->rootObject(), "closeContextMenu");
} else if (event->type() == QMouseEvent::MouseMove) { } else if (event->type() == QMouseEvent::MouseMove) {
if (m_itemToDrag.isValid()) { if (m_itemToDrag.isValid()) {

2
src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.cpp
View File

@@ -85,7 +85,7 @@ public:
bool MaterialBrowserWidget::eventFilter(QObject *obj, QEvent *event) bool MaterialBrowserWidget::eventFilter(QObject *obj, QEvent *event)
{ {
if (event->type() == QEvent::FocusOut) { if (event->type() == QEvent::FocusOut) {
if (obj == m_quickWidget.data()) if (obj == m_quickWidget->quickWidget())
QMetaObject::invokeMethod(m_quickWidget->rootObject(), "closeContextMenu"); QMetaObject::invokeMethod(m_quickWidget->rootObject(), "closeContextMenu");
} else if (event->type() == QMouseEvent::MouseMove) { } else if (event->type() == QMouseEvent::MouseMove) {
DesignDocument *document = QmlDesignerPlugin::instance()->currentDesignDocument(); DesignDocument *document = QmlDesignerPlugin::instance()->currentDesignDocument();