From f1e3d2f51377f91edededf20074cd82e05f1e7fc Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 27 May 2019 17:01:29 +0200 Subject: [PATCH] Disable touchbar on macOS < 10.13. --- .../SourceFiles/platform/mac/main_window_mac.h | 1 + .../SourceFiles/platform/mac/main_window_mac.mm | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.h b/Telegram/SourceFiles/platform/mac/main_window_mac.h index 0597ff0864..8910c810d1 100644 --- a/Telegram/SourceFiles/platform/mac/main_window_mac.h +++ b/Telegram/SourceFiles/platform/mac/main_window_mac.h @@ -83,6 +83,7 @@ protected: void closeWithoutDestroy() override; private: + void initTouchBar(); void hideAndDeactivate(); void createGlobalMenu(); void updateTitleCounter(); diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm index 6794936034..16e7c76b90 100644 --- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm +++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm @@ -396,6 +396,21 @@ MainWindow::MainWindow() } }); + initTouchBar(); +} + +void MainWindow::initTouchBar() { + const int version = QSysInfo::macVersion(); + constexpr int kShift = 2; + if (version == QSysInfo::MV_Unknown +#ifndef OS_MAC_OLD + || version == QSysInfo::MV_None +#endif // OS_MAC_OLD + // Allow touch bar only starting with 10.13. + || version < kShift + 13) { + return; + } + subscribe(Core::App().authSessionChanged(), [this] { if (AuthSession::Exists()) { // We need only common pinned dialogs.