mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into temp

Browse Source 
Conflicts:
	Telegram/SourceFiles/settings/settings_widget.cpp
This commit is contained in:
John Preston
2017-02-18 14:37:57 +03:00
parent 8060c7e141 540ba9bfaf
commit 36fc7d1991
7 changed files with 81 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,10 +99,14 @@ void MainWindow::showPhoto(PhotoData *photo, PeerData *peer) {
}
void MainWindow::showDocument(DocumentData *doc, HistoryItem *item) {
if (_mediaView->isHidden()) Ui::hideLayer(true);
_mediaView->showDocument(doc, item);
_mediaView->activateWindow();
_mediaView->setFocus();
if (cUseExternalVideoPlayer() && doc->isVideo()) {
QDesktopServices::openUrl(QUrl("file:///" + doc->location(false).fname));
} else {
if (_mediaView->isHidden()) Ui::hideLayer(true);
_mediaView->showDocument(doc, item);
_mediaView->activateWindow();
_mediaView->setFocus();
}
}
bool MainWindow::ui_isMediaViewShown() {