procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Highlight timestamps in media viewer.

This commit is contained in:
John Preston 2019-12-27 15:35:35 +03:00
parent fedf29adb1
commit a7fe88bea7
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
View File

@ -31,6 +31,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "media/player/media_player_instance.h" #include "media/player/media_player_instance.h"
#include "history/history.h" #include "history/history.h"
#include "history/history_message.h" #include "history/history_message.h"
#include "history/view/media/history_view_media.h"
#include "data/data_media_types.h" #include "data/data_media_types.h"
#include "data/data_session.h" #include "data/data_session.h"
#include "data/data_channel.h" #include "data/data_channel.h"
@ -436,8 +437,8 @@ bool OverlayWidget::documentBubbleShown() const {
&& _current.isNull()); && _current.isNull());
} }
void OverlayWidget::clearStreaming() { void OverlayWidget::clearStreaming(bool savePosition) {
if (_streamed && _doc) { if (_streamed && _doc && savePosition) {
const auto state = _streamed->instance.player().prepareLegacyState(); const auto state = _streamed->instance.player().prepareLegacyState();
const auto time = (state.position == kTimeUnknown const auto time = (state.position == kTimeUnknown
|| state.length == kTimeUnknown) || state.length == kTimeUnknown)
@ -1640,10 +1641,18 @@ void OverlayWidget::refreshCaption(HistoryItem *item) {
} }
return false; return false;
}(); }();
using namespace HistoryView;
_caption = Ui::Text::String(st::msgMinWidth); _caption = Ui::Text::String(st::msgMinWidth);
const auto duration = (_streamed && !videoIsGifv())
? _doc->getDuration()
: 0;
const auto base = duration
? DocumentTimestampLinkBase(_doc, item->fullId())
: QString();
_caption.setMarkedText( _caption.setMarkedText(
st::mediaviewCaptionStyle, st::mediaviewCaptionStyle,
caption, AddTimestampLinks(caption, duration, base),
Ui::ItemTextOptions(item)); Ui::ItemTextOptions(item));
} }
@ -1852,7 +1861,7 @@ void OverlayWidget::displayDocument(
} }
_fullScreenVideo = false; _fullScreenVideo = false;
_current = QPixmap(); _current = QPixmap();
clearStreaming(); clearStreaming(_doc != doc);
destroyThemePreview(); destroyThemePreview();
_doc = doc; _doc = doc;
_themeCloudData = cloud; _themeCloudData = cloud;
@ -1860,7 +1869,6 @@ void OverlayWidget::displayDocument(
_radial.stop(); _radial.stop();
refreshMediaViewer(); refreshMediaViewer();
refreshCaption(item);
if (_doc) { if (_doc) {
if (_doc->sticker()) { if (_doc->sticker()) {
if (const auto image = _doc->getStickerLarge()) { if (const auto image = _doc->getStickerLarge()) {
@ -1892,6 +1900,7 @@ void OverlayWidget::displayDocument(
} }
} }
} }
refreshCaption(item);
_docIconRect = QRect((width() - st::mediaviewFileIconSize) / 2, (height() - st::mediaviewFileIconSize) / 2, st::mediaviewFileIconSize, st::mediaviewFileIconSize); _docIconRect = QRect((width() - st::mediaviewFileIconSize) / 2, (height() - st::mediaviewFileIconSize) / 2, st::mediaviewFileIconSize, st::mediaviewFileIconSize);
if (documentBubbleShown()) { if (documentBubbleShown()) {

2
Telegram/SourceFiles/media/view/media_view_overlay_widget.h
View File

@ -324,7 +324,7 @@ private:
[[nodiscard]] bool documentContentShown() const; [[nodiscard]] bool documentContentShown() const;
[[nodiscard]] bool documentBubbleShown() const; [[nodiscard]] bool documentBubbleShown() const;
void paintTransformedVideoFrame(Painter &p); void paintTransformedVideoFrame(Painter &p);
void clearStreaming(); void clearStreaming(bool savePosition = true);
QBrush _transparentBrush; QBrush _transparentBrush;