From 3327d937002c26b947afdafe14c2f682a180ab85 Mon Sep 17 00:00:00 2001 From: hewenfei Date: Tue, 27 Jun 2023 16:18:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dwayland=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E4=BC=9A=E6=89=93=E5=BC=80=E5=A4=9A=E4=B8=AA=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../recent-file/qml/RecentFileExtension.qml | 9 +++- .../recent-file/recent-file-extension.cpp | 51 +++++++++++------- extension/recent-file/recent-file-extension.h | 4 ++ src/menu/menu-manager.cpp | 53 ++++++++++++++----- src/menu/menu-manager.h | 3 ++ src/utils/app-page-header-utils.cpp | 25 ++++++--- src/windows/menu-main-window.cpp | 7 +++ 7 files changed, 113 insertions(+), 39 deletions(-) mode change 100644 => 100755 src/menu/menu-manager.cpp diff --git a/extension/recent-file/qml/RecentFileExtension.qml b/extension/recent-file/qml/RecentFileExtension.qml index 786aa89..87a3a7e 100644 --- a/extension/recent-file/qml/RecentFileExtension.qml +++ b/extension/recent-file/qml/RecentFileExtension.qml @@ -43,6 +43,13 @@ UkuiMenuExtension { } } + onClicked: { + var data = { + "action": "closeMenu" + } + send(data); + } + AppControls2.StyleBackground { anchors.top: parent.top width: parent.width; height: 1 @@ -157,7 +164,7 @@ UkuiMenuExtension { "url": model.uri, "index": model.index } - data["action"] = mouse.button === Qt.RightButton ? "right" : "" + data["action"] = mouse.button === Qt.RightButton ? "right" : "openFile" send(data) } } diff --git a/extension/recent-file/recent-file-extension.cpp b/extension/recent-file/recent-file-extension.cpp index bc28e79..c998cdd 100644 --- a/extension/recent-file/recent-file-extension.cpp +++ b/extension/recent-file/recent-file-extension.cpp @@ -350,14 +350,20 @@ QVariantMap RecentFileExtension::data() void RecentFileExtension::receive(QVariantMap data) { - QString path = data.value("url").toString(); if (data.value("action").toString() == "right") { + QString path = data.value("url").toString(); int index = data.value("index").toInt(); creatMenu(path, index); return; + + } else if (m_contextMenu) { + m_contextMenu.data()->close(); } - openFile(path); + if (data.value("action").toString() == "openFile") { + QString path = data.value("url").toString(); + openFile(path); + } } void RecentFileExtension::openFile(const QString &fileUrl) @@ -378,29 +384,35 @@ void RecentFileExtension::openFile(const QString &fileUrl) void RecentFileExtension::creatMenu(const QString &path, const int &index) { - QMenu menu; + if (m_contextMenu) { + m_contextMenu.data()->close(); + return; + } - QAction open(QIcon::fromTheme("document-open-symbolic"), tr("Open")); - QAction remove(QIcon::fromTheme("edit-clear-symbolic"), tr("Remove from list")); - QAction clear(QIcon::fromTheme("edit-delete-symbolic"), tr("Clear list")); - QAction directory(tr("Open the directory where the file is located")); + QMenu *menu = new QMenu; + menu->setAttribute(Qt::WA_DeleteOnClose); - connect(&open, &QAction::triggered, this, [this, path]() { + QAction *open = new QAction(QIcon::fromTheme("document-open-symbolic"), tr("Open"), menu); + QAction *remove = new QAction(QIcon::fromTheme("edit-clear-symbolic"), tr("Remove from list"), menu); + QAction *clear = new QAction(QIcon::fromTheme("edit-delete-symbolic"), tr("Clear list"), menu); + QAction *directory = new QAction(tr("Open the directory where the file is located"), menu); + + connect(open, &QAction::triggered, this, [this, path]() { openFile(path); }); - connect(&remove, &QAction::triggered, this, [this, index]() { + connect(remove, &QAction::triggered, this, [this, index]() { GVFSRecentFileData::removeRecentFileByInfoId(m_recentFilesModel->getInfoId(index)); }); - connect(&clear, &QAction::triggered, this, [this]() { + connect(clear, &QAction::triggered, this, [this]() { QStringList infoIdList = m_recentFilesModel->getAllInfoId(); for (const QString &infoId : infoIdList) { GVFSRecentFileData::removeRecentFileByInfoId(infoId); } }); - connect(&directory, &QAction::triggered, this, [this, path]() { + connect(directory, &QAction::triggered, this, [this, path]() { QDBusMessage message = QDBusMessage::createMethodCall(FREEDESKTOP_FILEMANAGER_NAME, FREEDESKTOP_FILEMANAGER_PATH, FREEDESKTOP_FILEMANAGER_INTERFACE, "ShowFolders"); @@ -408,13 +420,16 @@ void RecentFileExtension::creatMenu(const QString &path, const int &index) QDBusConnection::sessionBus().asyncCall(message); }); - menu.addAction(&open); - menu.addSeparator(); - menu.addAction(&remove); - menu.addAction(&clear); - menu.addSeparator(); - menu.addAction(&directory); - menu.exec(QCursor::pos()); + menu->addAction(open); + menu->addSeparator(); + menu->addAction(remove); + menu->addAction(clear); + menu->addSeparator(); + menu->addAction(directory); + + m_contextMenu = menu; + + menu->popup(QCursor::pos()); } RecentFilesModel::RecentFilesModel(QObject *parent) : QAbstractListModel(parent) diff --git a/extension/recent-file/recent-file-extension.h b/extension/recent-file/recent-file-extension.h index 633c4f8..75683f6 100644 --- a/extension/recent-file/recent-file-extension.h +++ b/extension/recent-file/recent-file-extension.h @@ -19,6 +19,9 @@ #ifndef UKUI_MENU_RECENT_FILE_EXTENSION_H #define UKUI_MENU_RECENT_FILE_EXTENSION_H +#include +#include + class QThread; #include "menu-extension-iface.h" @@ -53,6 +56,7 @@ public: void receive(QVariantMap data) override; private: + QPointer m_contextMenu; QVector m_recentFile; QVariantMap m_data; RecentFilesModel *m_recentFilesModel = nullptr; diff --git a/src/menu/menu-manager.cpp b/src/menu/menu-manager.cpp old mode 100644 new mode 100755 index e3fa060..31e6123 --- a/src/menu/menu-manager.cpp +++ b/src/menu/menu-manager.cpp @@ -34,6 +34,8 @@ #include #include #include +#include +#include using namespace UkuiMenu; @@ -192,6 +194,8 @@ MenuManager *MenuManager::instance() class MenuManagerPrivate { public: + QPointer contextMenu; + QWindow *mainWindow {nullptr}; QList providers; }; @@ -238,21 +242,46 @@ void MenuManager::showMenu(const DataEntity &entity, const MenuInfo::Location lo void MenuManager::showMenu(const MenuProvider::RequestType &type, QVariant data, const MenuInfo::Location location, const QString &lid, const QPoint &point) { - QMenu menu; - - QList actions; - for (const auto &provider : d->providers) { - if (provider->isSupport(type)) { - actions.append(provider->generateActions(&menu, data, location, lid)); - } - } - - if (actions.isEmpty() && menu.isEmpty()) { + if (closeMenu()) { return; } - menu.addActions(actions); - menu.exec(checkPoint(point)); + QMenu *menu = new QMenu; + QList actions; + for (const auto &provider : d->providers) { + if (provider->isSupport(type)) { + actions.append(provider->generateActions(menu, data, location, lid)); + } + } + + if (actions.isEmpty() && menu->isEmpty()) { + delete menu; + return; + } + + d->contextMenu = menu; + menu->setAttribute(Qt::WA_DeleteOnClose); + if (menu->winId()) { + menu->windowHandle()->setTransientParent(d->mainWindow); + } + + menu->addActions(actions); + menu->popup(checkPoint(point)); +} + +void MenuManager::setMainWindow(QWindow *mainWindow) +{ + d->mainWindow = mainWindow; +} + +bool MenuManager::closeMenu() +{ + if (d->contextMenu) { + d->contextMenu.data()->close(); + return true; + } + + return false; } inline QPoint MenuManager::checkPoint(const QPoint &rawPoint) diff --git a/src/menu/menu-manager.h b/src/menu/menu-manager.h index 2a11552..cdf2e58 100644 --- a/src/menu/menu-manager.h +++ b/src/menu/menu-manager.h @@ -25,6 +25,7 @@ #include "data-entity.h" #include "menu-provider.h" +class QWindow; class MenuManagerPrivate; namespace UkuiMenu { @@ -39,6 +40,8 @@ public: Q_INVOKABLE void showMenu(const QString &appid, MenuInfo::Location, const QString& lid = QString(), const QPoint &point = QPoint()); void showMenu(const DataEntity &entity, MenuInfo::Location location, const QString& lid = QString(), const QPoint &point = QPoint()); void showMenu(const MenuProvider::RequestType &type, QVariant data, MenuInfo::Location location, const QString& lid = QString(), const QPoint &point = QPoint()); + void setMainWindow(QWindow *mainWindow); + bool closeMenu(); private: MenuManager(); diff --git a/src/utils/app-page-header-utils.cpp b/src/utils/app-page-header-utils.cpp index 0a6d86d..6737d9f 100644 --- a/src/utils/app-page-header-utils.cpp +++ b/src/utils/app-page-header-utils.cpp @@ -24,6 +24,7 @@ #include #include #include +#include namespace UkuiMenu { @@ -54,6 +55,7 @@ private: private: int m_currentIndex = 0; + QPointer m_menu; QString m_currentId; QVector m_providers; QHash m_roleNames; @@ -148,27 +150,34 @@ QString ProviderModel::currentProviderIcon() void ProviderModel::openMenu(int offset, int mouseX, int mouseY) { - QMenu menu; + if (m_menu) { + m_menu.data()->close(); + return; + } + + QMenu *menu = new QMenu; + menu->setAttribute(Qt::WA_DeleteOnClose); if (m_providers.isEmpty()) { return; } for (const ProviderInfo &info : m_providers) { - QAction *action = new QAction(info.name, &menu); + QAction *action = new QAction(info.name, menu); action->setCheckable(true); - connect(action, &QAction::triggered, &menu, [info]() { + connect(action, &QAction::triggered, menu, [info]() { DataProviderManager::instance()->activateProvider(info.id); }); - menu.addAction(action); + menu->addAction(action); } - menu.actions().at(m_currentIndex)->setChecked(true); - int x = mouseX - menu.sizeHint().width(); + menu->actions().at(m_currentIndex)->setChecked(true); + int x = mouseX - menu->sizeHint().width(); int y = mouseY + offset; - menu.exec(QPoint(x, y)); - Q_EMIT menuClosed(); + m_menu = menu; + connect(menu, &QMenu::aboutToHide, this, &ProviderModel::menuClosed); + menu->popup(QPoint(x, y)); } void ProviderModel::reactivateProvider() diff --git a/src/windows/menu-main-window.cpp b/src/windows/menu-main-window.cpp index 2bb8d60..36acd83 100644 --- a/src/windows/menu-main-window.cpp +++ b/src/windows/menu-main-window.cpp @@ -18,6 +18,7 @@ #include "menu-main-window.h" #include "settings.h" +#include "menu-manager.h" #include #include @@ -416,6 +417,8 @@ void MenuWindow::init() }); updateGeometry(); + + MenuManager::instance()->setMainWindow(this); } void MenuWindow::updateGeometry() @@ -515,6 +518,10 @@ bool MenuWindow::event(QEvent *event) if (event->type() == QEvent::UpdateRequest) { WindowHelper::removeHeaderBar(this); } + if (event->type() == QEvent::MouseButtonPress) { + MenuManager::instance()->closeMenu(); + } + return QQuickView::event(event); } From a62416550d92537ba4452efbdc499630265df8f9 Mon Sep 17 00:00:00 2001 From: hewenfei Date: Tue, 27 Jun 2023 16:19:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=80=81?= =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qml/AppControls2/AppItem.qml | 1 + qml/AppUI/AppPage.qml | 3 +-- src/uiconfig/theme-palette.cpp | 7 +++++++ src/uiconfig/theme-palette.h | 3 ++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/qml/AppControls2/AppItem.qml b/qml/AppControls2/AppItem.qml index 2d7207c..1027465 100644 --- a/qml/AppControls2/AppItem.qml +++ b/qml/AppControls2/AppItem.qml @@ -19,6 +19,7 @@ MouseArea { anchors.fill: parent radius: 4 useStyleTransparent: false + paletteRole: Palette.Light alpha: isSelect ? 1.00 : control.containsPress ? 0.82 : control.containsMouse ? 0.55 : 0.00 ToolTip.visible: content.textTruncated && control.containsMouse ToolTip.text: name diff --git a/qml/AppUI/AppPage.qml b/qml/AppUI/AppPage.qml index 181d5bb..6234cee 100644 --- a/qml/AppUI/AppPage.qml +++ b/qml/AppUI/AppPage.qml @@ -18,12 +18,11 @@ import QtQuick 2.12 import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.5 +import QtQuick.Controls 2.12 import AppControls2 1.0 as AppControls2 import org.ukui.menu.core 1.0 AppControls2.StyleBackground { - paletteRole: Palette.Window radius: 12 property alias header: appPageHeader property alias content: appPageContent diff --git a/src/uiconfig/theme-palette.cpp b/src/uiconfig/theme-palette.cpp index 05bb1a9..e687364 100644 --- a/src/uiconfig/theme-palette.cpp +++ b/src/uiconfig/theme-palette.cpp @@ -56,6 +56,8 @@ QColor ThemePalette::paletteColor(Palette::ColorRole colorRole, Palette::ColorGr return base(colorGroup); case Palette::Text: return text(colorGroup); + case Palette::BrightText: + return brightText(colorGroup); case Palette::AlternateBase: return alternateBase(colorGroup); case Palette::Button: @@ -111,6 +113,11 @@ QColor ThemePalette::text(Palette::ColorGroup colorGroup) const return QGuiApplication::palette().color(switchColorGroup(colorGroup), QPalette::Text); } +QColor ThemePalette::brightText(Palette::ColorGroup colorGroup) const +{ + return QGuiApplication::palette().color(switchColorGroup(colorGroup), QPalette::BrightText); +} + QColor ThemePalette::base(Palette::ColorGroup colorGroup) const { return QGuiApplication::palette().color(switchColorGroup(colorGroup), QPalette::Base); diff --git a/src/uiconfig/theme-palette.h b/src/uiconfig/theme-palette.h index a558546..95272cb 100644 --- a/src/uiconfig/theme-palette.h +++ b/src/uiconfig/theme-palette.h @@ -38,7 +38,7 @@ public: Q_ENUM(ColorGroup) enum ColorRole { - Window, WindowText, Base, Text, AlternateBase, + Window, WindowText, Base, BrightText, Text, AlternateBase, Button, ButtonText, Light, MidLight, Dark, Mid, Shadow, Highlight, HighlightedText }; @@ -80,6 +80,7 @@ public: Q_INVOKABLE QColor windowText(Palette::ColorGroup colorGroup = Palette::Active) const; Q_INVOKABLE QColor base(Palette::ColorGroup colorGroup = Palette::Active) const; Q_INVOKABLE QColor text(Palette::ColorGroup colorGroup = Palette::Active) const; + Q_INVOKABLE QColor brightText(Palette::ColorGroup colorGroup = Palette::Active) const; Q_INVOKABLE QColor alternateBase(Palette::ColorGroup colorGroup = Palette::Active) const; Q_INVOKABLE QColor button(Palette::ColorGroup colorGroup = Palette::Active) const; Q_INVOKABLE QColor buttonText(Palette::ColorGroup colorGroup = Palette::Active) const;