void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Relax controls hiding conditions in full screen.

Browse source 
Fixes #25499.
This commit is contained in:
John Preston 2023-01-09 14:03:27 +04:00
parent 90dfdb0e1f
commit 5f93725431
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
View file

@ -1529,10 +1529,7 @@ void OverlayWidget::hideControls(bool force) {
if (!_dropdown->isHidden() if (!_dropdown->isHidden()
|| (_streamed && _streamed->controls.hasMenu()) || (_streamed && _streamed->controls.hasMenu())
|| _menu || _menu
|| _mousePressed || _mousePressed) {
|| (_fullScreenVideo
&& !videoIsGifOrUserpic()
&& _streamed->controls.geometry().contains(_lastMouseMovePos))) {
return; return;
} }
} }
@ -3150,18 +3147,22 @@ void OverlayWidget::refreshClipControllerGeometry() {
void OverlayWidget::playbackControlsPlay() { void OverlayWidget::playbackControlsPlay() {
playbackPauseResume(); playbackPauseResume();
activateControls();
} }
void OverlayWidget::playbackControlsPause() { void OverlayWidget::playbackControlsPause() {
playbackPauseResume(); playbackPauseResume();
activateControls();
} }
void OverlayWidget::playbackControlsToFullScreen() { void OverlayWidget::playbackControlsToFullScreen() {
playbackToggleFullScreen(); playbackToggleFullScreen();
activateControls();
} }
void OverlayWidget::playbackControlsFromFullScreen() { void OverlayWidget::playbackControlsFromFullScreen() {
playbackToggleFullScreen(); playbackToggleFullScreen();
activateControls();
} }
void OverlayWidget::playbackControlsToPictureInPicture() { void OverlayWidget::playbackControlsToPictureInPicture() {
@ -3280,7 +3281,7 @@ void OverlayWidget::playbackControlsSeekProgress(crl::time position) {
if (!_streamed->instance.player().paused() if (!_streamed->instance.player().paused()
&& !_streamed->instance.player().finished()) { && !_streamed->instance.player().finished()) {
_streamed->pausedBySeek = true; _streamed->pausedBySeek = true;
playbackControlsPause(); playbackPauseResume();
} }
} }
@ -3290,6 +3291,7 @@ void OverlayWidget::playbackControlsSeekFinished(crl::time position) {
_streamingStartPaused = !_streamed->pausedBySeek _streamingStartPaused = !_streamed->pausedBySeek
&& !_streamed->instance.player().finished(); && !_streamed->instance.player().finished();
restartAtSeekPosition(position); restartAtSeekPosition(position);
activateControls();
} }
void OverlayWidget::playbackControlsVolumeChanged(float64 volume) { void OverlayWidget::playbackControlsVolumeChanged(float64 volume) {
@ -3307,6 +3309,7 @@ float64 OverlayWidget::playbackControlsCurrentVolume() {
void OverlayWidget::playbackControlsVolumeToggled() { void OverlayWidget::playbackControlsVolumeToggled() {
const auto volume = Core::App().settings().videoVolume(); const auto volume = Core::App().settings().videoVolume();
playbackControlsVolumeChanged(volume ? 0. : _lastPositiveVolume); playbackControlsVolumeChanged(volume ? 0. : _lastPositiveVolume);
activateControls();
} }
void OverlayWidget::playbackControlsVolumeChangeFinished() { void OverlayWidget::playbackControlsVolumeChangeFinished() {
@ -3314,6 +3317,7 @@ void OverlayWidget::playbackControlsVolumeChangeFinished() {
if (volume > 0.) { if (volume > 0.) {
_lastPositiveVolume = volume; _lastPositiveVolume = volume;
} }
activateControls();
} }
void OverlayWidget::playbackControlsSpeedChanged(float64 speed) { void OverlayWidget::playbackControlsSpeedChanged(float64 speed) {