From 7797099a49fa8b63f700eb726ec0fcf90ca290b0 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 7 Sep 2021 17:25:47 +0300 Subject: [PATCH] Fix media viewer loading animation first show. --- .../media/view/media_view_overlay_widget.cpp | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp index fc806c35b..b067011b8 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp @@ -737,6 +737,16 @@ void OverlayWidget::checkForSaveLoaded() { void OverlayWidget::updateControls() { if (_document && documentBubbleShown()) { + _docRect = QRect( + (width() - st::mediaviewFileSize.width()) / 2, + (height() - st::mediaviewFileSize.height()) / 2, + st::mediaviewFileSize.width(), + st::mediaviewFileSize.height()); + _docIconRect = QRect( + _docRect.x() + st::mediaviewFilePadding, + _docRect.y() + st::mediaviewFilePadding, + st::mediaviewFileIconSize, + st::mediaviewFileIconSize); if (_document->loading()) { _docDownload->hide(); _docSaveAs->hide(); @@ -758,6 +768,11 @@ void OverlayWidget::updateControls() { } updateDocSize(); } else { + _docIconRect = QRect( + (width() - st::mediaviewFileIconSize) / 2, + (height() - st::mediaviewFileIconSize) / 2, + st::mediaviewFileIconSize, + st::mediaviewFileIconSize); _docDownload->hide(); _docSaveAs->hide(); _docCancel->hide(); @@ -2430,7 +2445,6 @@ void OverlayWidget::displayDocument( } refreshCaption(item); - _docIconRect = QRect((width() - st::mediaviewFileIconSize) / 2, (height() - st::mediaviewFileIconSize) / 2, st::mediaviewFileIconSize, st::mediaviewFileIconSize); const auto docGeneric = Layout::DocumentGenericPreview::Create(_document); _docExt = docGeneric.ext; _docIconColor = docGeneric.color; @@ -2478,11 +2492,6 @@ void OverlayWidget::displayDocument( _docName = st::mediaviewFileNameFont->elided(_docName, maxw, Qt::ElideMiddle); _docNameWidth = st::mediaviewFileNameFont->width(_docName); } - - // _docSize is updated in updateControls() - - _docRect = QRect((width() - st::mediaviewFileSize.width()) / 2, (height() - st::mediaviewFileSize.height()) / 2, st::mediaviewFileSize.width(), st::mediaviewFileSize.height()); - _docIconRect = QRect(_docRect.x() + st::mediaviewFilePadding, _docRect.y() + st::mediaviewFilePadding, st::mediaviewFileIconSize, st::mediaviewFileIconSize); } else if (_themePreviewShown) { updateThemePreviewGeometry(); } else if (!_staticContent.isNull()) {