thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use third_party singleapplication helper

Browse source 
This may still not raise the application correctly on some WMs, because
they don't allow disturbing the user with windows popping up. I don't
think we want to work around that.

fixes #84
fixes #113
This commit is contained in:
Nicolas Werner 2020-02-23 13:40:04 +01:00
parent 3ef0d9db3c
commit e96241265e
15 changed files with 1488 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/main.cpp
View file

@ -37,9 +37,9 @@
#include "Logging.h"
#include "MainWindow.h"
#include "MatrixClient.h"
#include "RunGuard.h"
#include "Utils.h"
#include "config/nheko.h"
#include "singleapplication.h"
#if defined(Q_OS_MAC)
#include "emoji/MacHelper.h"
@ -104,18 +104,6 @@ createCacheDirectory()
int
main(int argc, char *argv[])
{
RunGuard guard("run_guard");
if (!guard.tryToRun()) {
QApplication a(argc, argv);
QMessageBox msgBox;
msgBox.setText("Another instance of Nheko is running");
msgBox.exec();
return 0;
}
#if defined(Q_OS_LINUX) || defined(Q_OS_WIN) || defined(Q_OS_FREEBSD)
if (qgetenv("QT_SCALE_FACTOR").size() == 0) {
float factor = utils::scaleFactor();
@ -130,7 +118,12 @@ main(int argc, char *argv[])
QCoreApplication::setOrganizationName("nheko");
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QApplication app(argc, argv);
SingleApplication app(argc,
argv,
false,
SingleApplication::Mode::User |
SingleApplication::Mode::ExcludeAppPath |
SingleApplication::Mode::ExcludeAppVersion);
QCommandLineParser parser;
parser.addHelpOption();
@ -192,6 +185,11 @@ main(int argc, char *argv[])
nhlog::net()->debug("bye");
}
});
QObject::connect(&app, &SingleApplication::instanceStarted, &w, [&w]() {
w.show();
w.raise();
w.activateWindow();
});
#if defined(Q_OS_MAC)
// Temporary solution for the emoji picker until