RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed old touchbar from MainWindow.

This commit is contained in:
23rd 2020-07-10 10:29:17 +03:00 committed by John Preston
parent f68e4d9d59
commit b02dd889e0
2 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/CMakeLists.txt
View File

@ -891,8 +891,6 @@ PRIVATE
platform/mac/specific_mac_p.h
platform/mac/window_title_mac.mm
platform/mac/window_title_mac.h
platform/mac/mac_touchbar.h
platform/mac/mac_touchbar.mm
platform/win/audio_win.cpp
platform/win/audio_win.h
platform/win/file_utilities_win.cpp

39
Telegram/SourceFiles/platform/mac/main_window_mac.mm
View File

@ -26,7 +26,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/window_session_controller.h"
#include "window/window_controller.h"
#include "window/themes/window_theme.h"
#include "platform/mac/mac_touchbar.h"
#include "platform/platform_notifications_manager.h"
#include "base/platform/base_platform_info.h"
#include "boxes/peer_list_controllers.h"
@ -144,9 +143,6 @@ public:
void didExitFullScreen();
bool clipboardHasText();
#ifndef OS_OSX
TouchBar *_touchBar = nil;
#endif // OS_OSX
~Private();
private:
@ -478,43 +474,11 @@ MainWindow::MainWindow(not_null<Window::Controller*> controller)
void MainWindow::initTouchBar() {
#ifndef OS_OSX
if (!IsMac10_13OrGreater()) {
return;
}
[NSApplication sharedApplication]
.automaticCustomizeTouchBarMenuItemEnabled = true;
const auto createNewTouchBar = [=](not_null<Main::Session*> session) {
if (_private->_touchBar) {
return;
}
if (auto view = reinterpret_cast<NSView*>(winId())) {
_private->_touchBar = [[TouchBar alloc]
init:view
session:session];
}
};
Core::App().domain().activeSessionChanges(
) | rpl::start_with_next([=](Main::Session *session) {
if (session) {
if (_private->_touchBar) {
destroyCurrentTouchBar();
}
createNewTouchBar(session);
} else {
destroyCurrentTouchBar();
}
}, lifetime());
#endif // OS_OSX
}
void MainWindow::destroyCurrentTouchBar() {
#ifndef OS_OSX
if (_private->_touchBar) {
[_private->_touchBar setTouchBar:Platform::TouchBarType::None];
[_private->_touchBar release];
}
_private->_touchBar = nil;
#endif // OS_OSX
}
@ -839,9 +803,6 @@ void MainWindow::updateGlobalMenuHook() {
}
#ifndef OS_OSX
if (_private->_touchBar) {
[_private->_touchBar showInputFieldItem:showTouchBarItem];
}
#endif // OS_OSX
App::wnd()->updateIsActive();