void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-07 07:33:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add global menu event hook on Linux just like on macOS

Browse source
This commit is contained in:
Ilya Fedin 2022-03-01 04:33:10 +04:00 • committed by John Preston
parent ffbafcb5fb
commit 805e6de1dc
2 changed files with 25 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
Telegram/SourceFiles/platform/linux/main_window_linux.cpp
View file

@ -405,43 +405,18 @@ uint djbStringHash(const std::string &string) {
} // namespace } // namespace
class MainWindow::Private : public QObject { class MainWindow::Private {
public: public:
explicit Private(not_null<MainWindow*> window)
: _public(window) {
QCoreApplication::instance()->installEventFilter(this);
}
base::unique_qptr<Ui::PopupMenu> trayIconMenuXEmbed; base::unique_qptr<Ui::PopupMenu> trayIconMenuXEmbed;
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
Glib::RefPtr<Gio::DBus::Connection> dbusConnection; Glib::RefPtr<Gio::DBus::Connection> dbusConnection;
#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
protected:
bool eventFilter(QObject *obj, QEvent *e) override;
private:
not_null<MainWindow*> _public;
}; };
bool MainWindow::Private::eventFilter(QObject *obj, QEvent *e) {
if (obj->objectName() == qstr("QSystemTrayIconSys")
&& e->type() == QEvent::MouseButtonPress) {
const auto ee = static_cast<QMouseEvent*>(e);
if (ee->button() == Qt::RightButton) {
Core::Sandbox::Instance().customEnterFromEventLoop([&] {
_public->handleTrayIconActication(QSystemTrayIcon::Context);
});
return true;
}
}
return QObject::eventFilter(obj, e);
}
MainWindow::MainWindow(not_null<Window::Controller*> controller) MainWindow::MainWindow(not_null<Window::Controller*> controller)
: Window::MainWindow(controller) : Window::MainWindow(controller)
, _private(std::make_unique<Private>(this)) { , _private(std::make_unique<Private>()) {
} }
void MainWindow::initHook() { void MainWindow::initHook() {
@ -860,6 +835,27 @@ void MainWindow::updateGlobalMenuHook() {
ForceDisabled(psClearFormat, !markdownEnabled); ForceDisabled(psClearFormat, !markdownEnabled);
} }
bool MainWindow::eventFilter(QObject *obj, QEvent *evt) {
QEvent::Type t = evt->type();
if (t == QEvent::MouseButtonPress
&& obj->objectName() == qstr("QSystemTrayIconSys")) {
const auto ee = static_cast<QMouseEvent*>(evt);
if (ee->button() == Qt::RightButton) {
Core::Sandbox::Instance().customEnterFromEventLoop([&] {
handleTrayIconActication(QSystemTrayIcon::Context);
});
return true;
}
} else if (t == QEvent::FocusIn || t == QEvent::FocusOut) {
if (qobject_cast<QLineEdit*>(obj)
|| qobject_cast<QTextEdit*>(obj)
|| dynamic_cast<HistoryInner*>(obj)) {
updateGlobalMenu();
}
}
return Window::MainWindow::eventFilter(obj, evt);
}
void MainWindow::handleNativeSurfaceChanged(bool exist) { void MainWindow::handleNativeSurfaceChanged(bool exist) {
if (exist) { if (exist) {
SkipTaskbar( SkipTaskbar(

2
Telegram/SourceFiles/platform/linux/main_window_linux.h
View file

@ -24,6 +24,8 @@ public:
~MainWindow(); ~MainWindow();
protected: protected:
bool eventFilter(QObject *obj, QEvent *evt) override;
void initHook() override; void initHook() override;
void unreadCounterChangedHook() override; void unreadCounterChangedHook() override;
void updateGlobalMenuHook() override; void updateGlobalMenuHook() override;