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

Fixed alpha 0.10.23 build for Linux.

This commit is contained in:
John Preston 2017-01-01 21:49:44 +04:00
parent a86c85485a
commit 72e34dc5b1
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Telegram/SourceFiles/platform/linux/file_dialog_linux.cpp
View File

@ -131,8 +131,7 @@ GtkDialog *QGtkDialog::gtkDialog() const {
void QGtkDialog::exec() { void QGtkDialog::exec() {
if (auto w = App::wnd()) { if (auto w = App::wnd()) {
w->onReActivate(); w->reActivateWindow();
QTimer::singleShot(200, w, SLOT(onReActivate()));
} }
if (modality() == Qt::ApplicationModal) { if (modality() == Qt::ApplicationModal) {
// block input to the whole app, including other GTK dialogs // block input to the whole app, including other GTK dialogs

3
Telegram/SourceFiles/ui/widgets/popup_menu.cpp
View File

@ -475,8 +475,7 @@ PopupMenu::~PopupMenu() {
} }
#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 #if defined Q_OS_LINUX32 || defined Q_OS_LINUX64
if (auto w = App::wnd()) { if (auto w = App::wnd()) {
w->onReActivate(); w->reActivateWindow();
QTimer::singleShot(200, w, SLOT(onReActivate()));
} }
#endif #endif
} }

3
Telegram/SourceFiles/window/main_window.cpp
View File

@ -125,8 +125,7 @@ void MainWindow::hideMediaview() {
if (_mediaView && !_mediaView->isHidden()) { if (_mediaView && !_mediaView->isHidden()) {
_mediaView->hide(); _mediaView->hide();
#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 #if defined Q_OS_LINUX32 || defined Q_OS_LINUX64
onReActivate(); reActivateWindow();
QTimer::singleShot(200, this, SLOT(onReActivate()));
#endif #endif
} }
} }

5
Telegram/SourceFiles/window/main_window.h
View File

@ -55,6 +55,11 @@ public:
return _titleText; return _titleText;
} }
void reActivateWindow() {
onReActivate();
QTimer::singleShot(200, this, SLOT(onReActivate()));
}
void showPhoto(const PhotoOpenClickHandler *lnk, HistoryItem *item = 0); void showPhoto(const PhotoOpenClickHandler *lnk, HistoryItem *item = 0);
void showPhoto(PhotoData *photo, HistoryItem *item); void showPhoto(PhotoData *photo, HistoryItem *item);
void showPhoto(PhotoData *photo, PeerData *item); void showPhoto(PhotoData *photo, PeerData *item);

3
Telegram/SourceFiles/window/notifications_manager.cpp
View File

@ -63,8 +63,7 @@ void Manager::notificationActivated(PeerId peerId, MsgId msgId) {
auto history = App::history(peerId); auto history = App::history(peerId);
window->showFromTray(); window->showFromTray();
#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 #if defined Q_OS_LINUX32 || defined Q_OS_LINUX64
window->onReActivate(); window->reActivateWindow();
QTimer::singleShot(200, window, SLOT(onReActivate()));
#endif #endif
if (App::passcoded()) { if (App::passcoded()) {
window->setInnerFocus(); window->setInnerFocus();