From 86993863c5ff7dcc745651151402ccd58f89dcc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Sat, 29 May 2021 00:17:53 +0200 Subject: [PATCH] Make the fullscreen shortcut more standard (+ fix Travis CI OS X build) --- src/GUI/keys.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/GUI/keys.h b/src/GUI/keys.h index b1da55cc..c37f42d4 100644 --- a/src/GUI/keys.h +++ b/src/GUI/keys.h @@ -28,11 +28,8 @@ #define PREV_MAP_SHORTCUT QKeySequence(QKeySequence::Back) #define SHOW_GRAPHS_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_G) #define STATISTICS_SHORTCUT QKeySequence(Qt::CTRL + Qt::Key_S) - -#ifdef Q_OS_MAC -#define FULLSCREEN_SHORTCUT QKeySequence(Qt::META + Qt::CTRL + Qt::Key_F) -#else // Q_OS_MAC -#define FULLSCREEN_SHORTCUT QKeySequence(Qt::Key_F11) -#endif // Q_OS_MAC +#define FULLSCREEN_SHORTCUT (QKeySequence(QKeySequence::FullScreen).isEmpty() \ + ? QKeySequence(Qt::Key_F11) \ + : QKeySequence(QKeySequence::FullScreen)) #endif // KEYS_H