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

Fix fullscreen rotate, fix rotate phrase.

This commit is contained in:
John Preston 2020-02-13 16:34:19 +04:00
parent 7bf2b607f9
commit 05c95a0307
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Telegram/Resources/langs/lang.strings
View File

@ -1581,6 +1581,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_mediaview_video_loading" = "Loading - {percent}"; "lng_mediaview_video_loading" = "Loading - {percent}";
"lng_mediaview_playback_speed" = "Playback speed"; "lng_mediaview_playback_speed" = "Playback speed";
"lng_mediaview_playback_speed_normal" = "Normal"; "lng_mediaview_playback_speed_normal" = "Normal";
"lng_mediaview_rotate_video" = "Rotate video";
"lng_theme_preview_title" = "Theme Preview"; "lng_theme_preview_title" = "Theme Preview";
"lng_theme_preview_generating" = "Generating color theme preview..."; "lng_theme_preview_generating" = "Generating color theme preview...";

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

@ -920,8 +920,8 @@ void OverlayWidget::resizeContentByScreenSize() {
_w = _width; _w = _width;
_h = _height; _h = _height;
} }
_x = skipWidth + (usew - _w) / 2; _x = (width() - _w) / 2;
_y = skipHeight + (useh - _h) / 2; _y = (height() - _h) / 2;
} }
float64 OverlayWidget::radialProgress() const { float64 OverlayWidget::radialProgress() const {
@ -2571,17 +2571,26 @@ void OverlayWidget::playbackControlsVolumeChangeFinished() {
} }
void OverlayWidget::playbackControlsSpeedChanged(float64 speed) { void OverlayWidget::playbackControlsSpeedChanged(float64 speed) {
DEBUG_LOG(("Media playback speed: change to %1.").arg(speed));
if (_doc) { if (_doc) {
DEBUG_LOG(("Media playback speed: %1 to settings.").arg(speed));
_doc->session().settings().setVideoPlaybackSpeed(speed); _doc->session().settings().setVideoPlaybackSpeed(speed);
_doc->session().saveSettingsDelayed(); _doc->session().saveSettingsDelayed();
} }
if (_streamed && !videoIsGifv()) { if (_streamed && !videoIsGifv()) {
DEBUG_LOG(("Media playback speed: %1 to _streamed.").arg(speed));
_streamed->instance.setSpeed(speed); _streamed->instance.setSpeed(speed);
} }
} }
float64 OverlayWidget::playbackControlsCurrentSpeed() { float64 OverlayWidget::playbackControlsCurrentSpeed() {
return _doc ? _doc->session().settings().videoPlaybackSpeed() : 1.; const auto result = _doc
? _doc->session().settings().videoPlaybackSpeed()
: 1.;
DEBUG_LOG(("Media playback speed: now %1 (doc %2)."
).arg(result
).arg(Logs::b(_doc != nullptr)));
return result;
} }
void OverlayWidget::switchToPip() { void OverlayWidget::switchToPip() {

3
Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
View File

@ -223,7 +223,7 @@ void PlaybackControls::showMenu() {
addSpeed(1.75); addSpeed(1.75);
addSpeed(2.); addSpeed(2.);
_menu.emplace(this, st::mediaviewControlsPopupMenu); _menu.emplace(this, st::mediaviewControlsPopupMenu);
_menu->addAction("Rotate video", [=] { _menu->addAction(tr::lng_mediaview_rotate_video(tr::now), [=] {
_delegate->playbackControlsRotate(); _delegate->playbackControlsRotate();
}); });
_menu->addSeparator(); _menu->addSeparator();
@ -235,6 +235,7 @@ void PlaybackControls::showMenu() {
} }
void PlaybackControls::updatePlaybackSpeed(float64 speed) { void PlaybackControls::updatePlaybackSpeed(float64 speed) {
DEBUG_LOG(("Media playback speed: update to %1.").arg(speed));
_delegate->playbackControlsSpeedChanged(speed); _delegate->playbackControlsSpeedChanged(speed);
resizeEvent(nullptr); resizeEvent(nullptr);
} }