fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-02-14 22:44:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9 from namecheap/bugfix/RND-700-flameshot-macos-menu-on-primary-display

Browse Source 
Bugfix/rnd 700 flameshot macos menu on primary display
This commit is contained in:
Yurii Puchkov
2020-12-02 18:30:13 +02:00
committed by GitHub
parent 207388dc34 c783b66672
commit bcd22e5b1c
2 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/core/controller.cpp
View File

@@ -50,6 +50,7 @@ Controller::Controller()
: m_captureWindow(nullptr)
{
m_history = nullptr;
m_trayIconMenu = nullptr;
qApp->setQuitOnLastWindowClosed(false);
@@ -87,6 +88,7 @@ Controller::Controller()
Controller::~Controller()
{
delete m_history;
delete m_trayIconMenu;
}
Controller* Controller::getInstance()
@@ -241,7 +243,7 @@ void Controller::enableTrayIcon()
if (m_trayIcon) {
return;
}
QMenu* trayIconMenu = new QMenu();
m_trayIconMenu = new QMenu();
ConfigHandler().setDisabledTrayIcon(false);
QAction* captureAction = new QAction(tr("&Take Screenshot"), this);
@@ -268,19 +270,22 @@ void Controller::enableTrayIcon()
recentAction, SIGNAL(triggered()), this, SLOT(showRecentScreenshots()));
// generate menu
trayIconMenu->addAction(captureAction);
trayIconMenu->addAction(launcherAction);
trayIconMenu->addSeparator();
trayIconMenu->addAction(recentAction);
trayIconMenu->addSeparator();
trayIconMenu->addAction(configAction);
trayIconMenu->addAction(infoAction);
trayIconMenu->addSeparator();
trayIconMenu->addAction(quitAction);
m_trayIconMenu->addAction(captureAction);
m_trayIconMenu->addAction(launcherAction);
m_trayIconMenu->addSeparator();
m_trayIconMenu->addAction(recentAction);
m_trayIconMenu->addSeparator();
m_trayIconMenu->addAction(configAction);
m_trayIconMenu->addAction(infoAction);
m_trayIconMenu->addSeparator();
m_trayIconMenu->addAction(quitAction);
m_trayIcon = new QSystemTrayIcon();
m_trayIcon->setToolTip(QStringLiteral("Flameshot"));
m_trayIcon->setContextMenu(trayIconMenu);
#if not(defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(Q_OS_MAC64) || \
defined(Q_OS_MACOS) || defined(Q_OS_MACX))
m_trayIcon->setContextMenu(m_trayIconMenu);
#endif
QIcon trayicon =
QIcon::fromTheme("flameshot-tray", QIcon(":img/app/flameshot.png"));
m_trayIcon->setIcon(trayicon);
@@ -293,6 +298,18 @@ void Controller::enableTrayIcon()
}
};
connect(m_trayIcon, &QSystemTrayIcon::activated, this, trayIconActivated);
#else
// Because of the following issues:
// https://bugreports.qt.io/browse/QTBUG-86393
// https://developer.apple.com/forums/thread/126072
auto trayIconActivated = [this](QSystemTrayIcon::ActivationReason r) {
if (m_trayIconMenu->isVisible()) {
m_trayIconMenu->hide();
} else {
m_trayIconMenu->popup(QPoint(QCursor::pos().x(), 0));
}
};
connect(m_trayIcon, &QSystemTrayIcon::activated, this, trayIconActivated);
#endif
#ifdef Q_OS_WIN

2
src/core/controller.h
View File

@@ -19,6 +19,7 @@
#include "src/core/capturerequest.h"
#include <QMap>
#include <QMenu>
#include <QObject>
#include <QPixmap>
#include <QPointer>
@@ -92,4 +93,5 @@ private:
QPointer<QSystemTrayIcon> m_trayIcon;
HistoryWidget* m_history;
QMenu* m_trayIconMenu;
};