diff options
| author | flow <flowlnlnln@gmail.com> | 2022-11-25 09:33:05 -0300 |
|---|---|---|
| committer | flow <flowlnlnln@gmail.com> | 2022-11-25 09:33:05 -0300 |
| commit | 4a1d08261408b63308dc1164c687e53c4f1fd08e (patch) | |
| tree | e08ba27115780a26e1e9de46d65f871a8916ffda /launcher | |
| parent | 20c281d6f8d5f25573a8c4c930a961ea9ab45380 (diff) | |
| download | PrismLauncher-4a1d08261408b63308dc1164c687e53c4f1fd08e.tar.gz PrismLauncher-4a1d08261408b63308dc1164c687e53c4f1fd08e.tar.bz2 PrismLauncher-4a1d08261408b63308dc1164c687e53c4f1fd08e.zip | |
reafctor(WideBar): connect to signal instead of overriding menu method
This makes stuff more standard and closer to what we do in other places
in the codebase.
Signed-off-by: flow <flowlnlnln@gmail.com>
Diffstat (limited to 'launcher')
| -rw-r--r-- | launcher/ui/widgets/WideBar.cpp | 13 | ||||
| -rw-r--r-- | launcher/ui/widgets/WideBar.h | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/launcher/ui/widgets/WideBar.cpp b/launcher/ui/widgets/WideBar.cpp index 81c445cb..428be563 100644 --- a/launcher/ui/widgets/WideBar.cpp +++ b/launcher/ui/widgets/WideBar.cpp @@ -38,7 +38,8 @@ WideBar::WideBar(const QString& title, QWidget* parent) : QToolBar(title, parent setFloatable(false); setMovable(false); - m_bar_menu = std::make_unique<QMenu>(this); + setContextMenuPolicy(Qt::ContextMenuPolicy::CustomContextMenu); + connect(this, &QToolBar::customContextMenuRequested, this, &WideBar::showVisibilityMenu); } WideBar::WideBar(QWidget* parent) : QToolBar(parent) @@ -46,7 +47,8 @@ WideBar::WideBar(QWidget* parent) : QToolBar(parent) setFloatable(false); setMovable(false); - m_bar_menu = std::make_unique<QMenu>(this); + setContextMenuPolicy(Qt::ContextMenuPolicy::CustomContextMenu); + connect(this, &QToolBar::customContextMenuRequested, this, &WideBar::showVisibilityMenu); } void WideBar::addAction(QAction* action) @@ -167,8 +169,11 @@ static void copyAction(QAction* from, QAction* to) to->setToolTip(from->toolTip()); } -void WideBar::contextMenuEvent(QContextMenuEvent* event) +void WideBar::showVisibilityMenu(QPoint const& position) { + if (!m_bar_menu) + m_bar_menu = std::make_unique<QMenu>(this); + if (m_menu_state == MenuState::Dirty) { for (auto* old_action : m_bar_menu->actions()) old_action->deleteLater(); @@ -198,7 +203,7 @@ void WideBar::contextMenuEvent(QContextMenuEvent* event) m_menu_state = MenuState::Fresh; } - m_bar_menu->popup(event->globalPos()); + m_bar_menu->popup(mapToGlobal(position)); } [[nodiscard]] QByteArray WideBar::getVisibilityState() const diff --git a/launcher/ui/widgets/WideBar.h b/launcher/ui/widgets/WideBar.h index ed4cb3c7..a0a7896c 100644 --- a/launcher/ui/widgets/WideBar.h +++ b/launcher/ui/widgets/WideBar.h @@ -24,7 +24,7 @@ class WideBar : public QToolBar { void insertActionAfter(QAction* after, QAction* action); QMenu* createContextMenu(QWidget* parent = nullptr, const QString& title = QString()); - void contextMenuEvent(QContextMenuEvent*) override; + void showVisibilityMenu(const QPoint&); // Ideally we would use a QBitArray for this, but it doesn't support string conversion, // so using it in settings is very messy. |