RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-01-10 16:59:55 +00:00
Code Issues Projects Releases Wiki Activity

hiding, not destroying window on close on OS X, fixed app event filter

Browse Source
This commit is contained in:
John Preston 2016-02-10 14:39:48 +03:00
parent 19d395a946
commit f2c45df524
5 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/Resources/style.txt
View File

@ -1016,7 +1016,7 @@ historyToEndSkip: 10px;
activeFadeInDuration: 500;
activeFadeOutDuration: 3000;
historyMaxWidth: 640px;
historyMaxWidth: 680px;
msgRadius: 3px;

11
Telegram/SourceFiles/application.cpp
View File

@ -57,15 +57,8 @@ namespace {
QKeyEvent *ev = static_cast<QKeyEvent*>(e);
if (cPlatform() == dbipMac || cPlatform() == dbipMacOld) {
if (ev->key() == Qt::Key_W && (ev->modifiers() & Qt::ControlModifier)) {
if (cWorkMode() == dbiwmTrayOnly || cWorkMode() == dbiwmWindowAndTray) {
App::wnd()->minimizeToTray();
return true;
} else {
App::wnd()->hide();
App::wnd()->updateIsActive(cOfflineBlurTimeout());
App::wnd()->updateGlobalMenu();
return true;
}
Ui::hideWindowNoQuit();
return true;
} else if (ev->key() == Qt::Key_M && (ev->modifiers() & Qt::ControlModifier)) {
App::wnd()->setWindowState(Qt::WindowMinimized);
return true;

16
Telegram/SourceFiles/facades.cpp
View File

@ -134,6 +134,22 @@ namespace Ui {
}
}
bool hideWindowNoQuit() {
if (!App::quiting()) {
if (Window *w = App::wnd()) {
if (cWorkMode() == dbiwmTrayOnly || cWorkMode() == dbiwmWindowAndTray) {
return w->minimizeToTray();
} else if (cPlatform() == dbipMac || cPlatform() == dbipMacOld) {
w->hide();
w->updateIsActive(cOfflineBlurTimeout());
w->updateGlobalMenu();
return true;
}
}
}
return false;
}
}
namespace Notify {

2
Telegram/SourceFiles/facades.h
View File

@ -67,6 +67,8 @@ namespace Ui {
showPeerHistory(PeerId(0), 0);
}
bool hideWindowNoQuit();
};
enum ClipStopperType {

4
Telegram/SourceFiles/window.cpp
View File

@ -990,7 +990,7 @@ bool Window::eventFilter(QObject *obj, QEvent *evt) {
} else if (t == QEvent::MouseButtonRelease) {
Ui::hideStickerPreview();
}
if (obj == App::app()) {
if (obj == Application::instance()) {
if (t == QEvent::ApplicationActivate) {
psUserActionDone();
QTimer::singleShot(1, this, SLOT(checkHistoryActivation()));
@ -1214,7 +1214,7 @@ void Window::toggleDisplayNotifyFromTray() {
}
void Window::closeEvent(QCloseEvent *e) {
if (MTP::authedId() && !Sandbox::isSavingSession() && minimizeToTray()) {
if (MTP::authedId() && !Sandbox::isSavingSession() && Ui::hideWindowNoQuit()) {
e->ignore();
} else {
App::quit();