mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev

Browse Source
This commit is contained in:
John Preston
2016-06-24 19:59:44 +03:00
parent 5c199e63ea deef74ebc7
commit 4bd97d2947
9 changed files with 51 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Telegram/SourceFiles/mainwindow.cpp
View File

@@ -925,13 +925,26 @@ void MainWindow::layerHidden() {
setInnerFocus();
}
void MainWindow::onReActivate() {
if (auto w = App::wnd()) {
if (auto f = QApplication::focusWidget()) {
f->clearFocus();
}
w->windowHandle()->requestActivate();
w->activate();
if (auto f = QApplication::focusWidget()) {
f->clearFocus();
}
w->setInnerFocus();
}
}
void MainWindow::hideMediaview() {
if (_mediaView && !_mediaView->isHidden()) {
_mediaView->hide();
#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64
if (App::wnd()) {
App::wnd()->activateWindow();
}
onReActivate();
QTimer::singleShot(200, this, SLOT(onReActivate()));
#endif
}
}