From aade3d4f27134e0db1eb50c4bbe750fd981d3441 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 6 Mar 2019 10:49:41 +0400 Subject: [PATCH] Allow streaming video from overview. --- .../history/media/history_media_video.cpp | 2 +- .../SourceFiles/overview/overview_layout.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Telegram/SourceFiles/history/media/history_media_video.cpp b/Telegram/SourceFiles/history/media/history_media_video.cpp index 9decda064..9f311b839 100644 --- a/Telegram/SourceFiles/history/media/history_media_video.cpp +++ b/Telegram/SourceFiles/history/media/history_media_video.cpp @@ -213,7 +213,7 @@ void HistoryVideo::draw(Painter &p, const QRect &r, TextSelection selection, crl auto over = _animation->a_thumbOver.current(); p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, over)); } else { - bool over = ClickHandler::showAsActive(_data->loading() ? _cancell : _savel); + bool over = ClickHandler::showAsActive((_data->loading() || _data->uploading()) ? _cancell : _savel); p.setBrush(over ? st::msgDateImgBgOver : st::msgDateImgBg); } diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp index a1ed99862..561760590 100644 --- a/Telegram/SourceFiles/overview/overview_layout.cpp +++ b/Telegram/SourceFiles/overview/overview_layout.cpp @@ -492,7 +492,7 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const if (selected) { p.setBrush(st::msgDateImgBgSelected); } else { - auto over = ClickHandler::showAsActive(loaded ? _openl : (_data->loading() ? _cancell : _savel)); + auto over = ClickHandler::showAsActive((_data->loading() || _data->uploading()) ? _cancell : _data->canBePlayed() ? _openl : _savel); p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, _a_iconOver.current(context->ms, over ? 1. : 0.))); } @@ -502,14 +502,14 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const } p.setOpacity((radial && loaded) ? _radial->opacity() : 1); - auto icon = ([radial, loaded, selected] { - if (radial) { + const auto icon = [&] { + if (_data->loading() || _data->uploading()) { return &(selected ? st::historyFileThumbCancelSelected : st::historyFileThumbCancel); - } else if (loaded) { + } else if (_data->canBePlayed()) { return &(selected ? st::historyFileThumbPlaySelected : st::historyFileThumbPlay); } return &(selected ? st::historyFileThumbDownloadSelected : st::historyFileThumbDownload); - })(); + }(); icon->paintInCenter(p, inner); if (radial) { p.setOpacity(1); @@ -546,10 +546,10 @@ TextState Video::getState( bool loaded = _data->loaded(); if (hasPoint(point)) { - const auto link = loaded - ? _openl - : _data->loading() + const auto link = (_data->loading() || _data->uploading()) ? _cancell + : _data->canBePlayed() + ? _openl : _savel; return { parent(), link }; }