diff --git a/applets/notifications/filemenu.cpp b/applets/notifications/filemenu.cpp index 6ef81e350..355d2d8a5 100644 --- a/applets/notifications/filemenu.cpp +++ b/applets/notifications/filemenu.cpp @@ -1,185 +1,187 @@ /* Copyright (C) 2016,2019 Kai Uwe Broulik This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "filemenu.h" #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include FileMenu::FileMenu(QObject *parent) : QObject(parent) { } FileMenu::~FileMenu() = default; QUrl FileMenu::url() const { return m_url; } void FileMenu::setUrl(const QUrl &url) { if (m_url != url) { m_url = url; emit urlChanged(); } } QQuickItem *FileMenu::visualParent() const { return m_visualParent.data(); } void FileMenu::setVisualParent(QQuickItem *visualParent) { if (m_visualParent.data() == visualParent) { return; } if (m_visualParent) { disconnect(m_visualParent.data(), nullptr, this, nullptr); } m_visualParent = visualParent; if (m_visualParent) { connect(m_visualParent.data(), &QObject::destroyed, this, &FileMenu::visualParentChanged); } emit visualParentChanged(); } bool FileMenu::visible() const { return m_visible; } void FileMenu::setVisible(bool visible) { if (m_visible == visible) { return; } if (visible) { open(0, 0); } else { // TODO warning or close? } } void FileMenu::open(int x, int y) { if (!m_visualParent || !m_visualParent->window()) { return; } if (!m_url.isValid()) { return; } KFileItem fileItem(m_url); QMenu *menu = new QMenu(); menu->setAttribute(Qt::WA_DeleteOnClose, true); connect(menu, &QMenu::triggered, this, &FileMenu::actionTriggered); connect(menu, &QMenu::aboutToHide, this, [this] { m_visible = false; emit visibleChanged(); }); if (KProtocolManager::supportsListing(m_url)) { QAction *openContainingFolderAction = menu->addAction(QIcon::fromTheme(QStringLiteral("folder-open")), i18n("Open Containing Folder")); connect(openContainingFolderAction, &QAction::triggered, [this] { KIO::highlightInFileManager({m_url}); }); } KFileItemActions *actions = new KFileItemActions(menu); KFileItemListProperties itemProperties(KFileItemList({fileItem})); actions->setItemListProperties(itemProperties); actions->addOpenWithActionsTo(menu); // KStandardAction? But then the Ctrl+C shortcut makes no sense in this context QAction *copyAction = menu->addAction(QIcon::fromTheme(QStringLiteral("edit-copy")), i18n("&Copy")); connect(copyAction, &QAction::triggered, [fileItem] { // inspired by KDirModel::mimeData() QMimeData *data = new QMimeData(); // who cleans it up? KUrlMimeData::setUrls({fileItem.url()}, {fileItem.mostLocalUrl()}, data); QApplication::clipboard()->setMimeData(data); }); actions->addServiceActionsTo(menu); actions->addPluginActionsTo(menu); QAction *propertiesAction = menu->addAction(QIcon::fromTheme(QStringLiteral("document-properties")), i18n("Properties")); connect(propertiesAction, &QAction::triggered, [fileItem] { KPropertiesDialog *dialog = new KPropertiesDialog(fileItem.url()); dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->show(); }); //this is a workaround where Qt will fail to realize a mouse has been released // this happens if a window which does not accept focus spawns a new window that takes focus and X grab // whilst the mouse is depressed // https://bugreports.qt.io/browse/QTBUG-59044 // this causes the next click to go missing //by releasing manually we avoid that situation auto ungrabMouseHack = [this]() { if (m_visualParent && m_visualParent->window() && m_visualParent->window()->mouseGrabberItem()) { m_visualParent->window()->mouseGrabberItem()->ungrabMouse(); } }; QTimer::singleShot(0, m_visualParent, ungrabMouseHack); //end workaround QPoint pos; if (x == -1 && y == -1) { // align "bottom left of visualParent" menu->adjustSize(); pos = m_visualParent->mapToGlobal(QPointF(0, m_visualParent->height())).toPoint(); if (!qApp->isRightToLeft()) { pos.rx() += m_visualParent->width(); pos.rx() -= menu->width(); } } else { pos = m_visualParent->mapToGlobal(QPointF(x, y)).toPoint(); } + menu->winId(); + menu->windowHandle()->setTransientParent(m_visualParent->window()); menu->popup(pos); m_visible = true; emit visibleChanged(); }