0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reafctor(WideBar): connect to signal instead of overriding menu method

Browse Source 
This makes stuff more standard and closer to what we do in other places
in the codebase.

Signed-off-by: flow <flowlnlnln@gmail.com>
This commit is contained in:
flow 2022-11-25 09:33:05 -03:00
parent 20c281d6f8
commit 4a1d082614
No known key found for this signature in database
GPG Key ID: 8D0F221F0A59F469
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
launcher/ui/widgets/WideBar.cpp
View File

@ -38,7 +38,8 @@ WideBar::WideBar(const QString& title, QWidget* parent) : QToolBar(title, parent
setFloatable(false); setFloatable(false);
setMovable(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) WideBar::WideBar(QWidget* parent) : QToolBar(parent)
@ -46,7 +47,8 @@ WideBar::WideBar(QWidget* parent) : QToolBar(parent)
setFloatable(false); setFloatable(false);
setMovable(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) void WideBar::addAction(QAction* action)
@ -167,8 +169,11 @@ static void copyAction(QAction* from, QAction* to)
to->setToolTip(from->toolTip()); 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) { if (m_menu_state == MenuState::Dirty) {
for (auto* old_action : m_bar_menu->actions()) for (auto* old_action : m_bar_menu->actions())
old_action->deleteLater(); old_action->deleteLater();
@ -198,7 +203,7 @@ void WideBar::contextMenuEvent(QContextMenuEvent* event)
m_menu_state = MenuState::Fresh; m_menu_state = MenuState::Fresh;
} }
m_bar_menu->popup(event->globalPos()); m_bar_menu->popup(mapToGlobal(position));
} }
[[nodiscard]] QByteArray WideBar::getVisibilityState() const [[nodiscard]] QByteArray WideBar::getVisibilityState() const

2
launcher/ui/widgets/WideBar.h
View File

@ -24,7 +24,7 @@ class WideBar : public QToolBar {
void insertActionAfter(QAction* after, QAction* action); void insertActionAfter(QAction* after, QAction* action);
QMenu* createContextMenu(QWidget* parent = nullptr, const QString& title = QString()); 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, // Ideally we would use a QBitArray for this, but it doesn't support string conversion,
// so using it in settings is very messy. // so using it in settings is very messy.