diff --git a/Telegram/Resources/icons/media_fullscreen_from.png b/Telegram/Resources/icons/media_fullscreen_from.png index 6d241d992e..7b3ae509d1 100644 Binary files a/Telegram/Resources/icons/media_fullscreen_from.png and b/Telegram/Resources/icons/media_fullscreen_from.png differ diff --git a/Telegram/Resources/icons/media_fullscreen_from@2x.png b/Telegram/Resources/icons/media_fullscreen_from@2x.png index 448b42b0f3..10b1ce125b 100644 Binary files a/Telegram/Resources/icons/media_fullscreen_from@2x.png and b/Telegram/Resources/icons/media_fullscreen_from@2x.png differ diff --git a/Telegram/Resources/icons/media_fullscreen_to.png b/Telegram/Resources/icons/media_fullscreen_to.png index 43c7a54c79..9ce7f75afb 100644 Binary files a/Telegram/Resources/icons/media_fullscreen_to.png and b/Telegram/Resources/icons/media_fullscreen_to.png differ diff --git a/Telegram/Resources/icons/media_fullscreen_to@2x.png b/Telegram/Resources/icons/media_fullscreen_to@2x.png index cf386f13d4..7236303338 100644 Binary files a/Telegram/Resources/icons/media_fullscreen_to@2x.png and b/Telegram/Resources/icons/media_fullscreen_to@2x.png differ diff --git a/Telegram/Resources/icons/media_pause.png b/Telegram/Resources/icons/media_pause.png index 2ae4e1ebb6..f4291828dc 100644 Binary files a/Telegram/Resources/icons/media_pause.png and b/Telegram/Resources/icons/media_pause.png differ diff --git a/Telegram/Resources/icons/media_pause@2x.png b/Telegram/Resources/icons/media_pause@2x.png index ffba955ada..24a8b16f04 100644 Binary files a/Telegram/Resources/icons/media_pause@2x.png and b/Telegram/Resources/icons/media_pause@2x.png differ diff --git a/Telegram/Resources/icons/media_play.png b/Telegram/Resources/icons/media_play.png index 018ef78e96..4b845b5193 100644 Binary files a/Telegram/Resources/icons/media_play.png and b/Telegram/Resources/icons/media_play.png differ diff --git a/Telegram/Resources/icons/media_play@2x.png b/Telegram/Resources/icons/media_play@2x.png index 44805a939c..74911abe63 100644 Binary files a/Telegram/Resources/icons/media_play@2x.png and b/Telegram/Resources/icons/media_play@2x.png differ diff --git a/Telegram/SourceFiles/media/view/media_clip_controller.cpp b/Telegram/SourceFiles/media/view/media_clip_controller.cpp index 8b5708e882..796aee8cc8 100644 --- a/Telegram/SourceFiles/media/view/media_clip_controller.cpp +++ b/Telegram/SourceFiles/media/view/media_clip_controller.cpp @@ -186,10 +186,10 @@ void Controller::resizeEvent(QResizeEvent *e) { _playPauseResume->moveToLeft(st::mediaviewPlayPauseLeft, playTop); int fullScreenTop = (height() - _fullScreenToggle->height()) / 2; - _fullScreenToggle->moveToRight(st::mediaviewPlayPauseLeft, fullScreenTop); + _fullScreenToggle->moveToRight(st::mediaviewFullScreenLeft, fullScreenTop); - _volumeController->moveToRight(st::mediaviewPlayPauseLeft + _fullScreenToggle->width() + st::mediaviewVolumeLeft, (height() - _volumeController->height()) / 2); - _playback->resize(width() - st::mediaviewPlayPauseLeft - _playPauseResume->width() - playTop - fullScreenTop - _volumeController->width() - st::mediaviewVolumeLeft - _fullScreenToggle->width() - st::mediaviewPlayPauseLeft, st::mediaviewSeekSize.height()); + _volumeController->moveToRight(st::mediaviewFullScreenLeft + _fullScreenToggle->width() + st::mediaviewVolumeLeft, (height() - _volumeController->height()) / 2); + _playback->resize(width() - st::mediaviewPlayPauseLeft - _playPauseResume->width() - playTop - fullScreenTop - _volumeController->width() - st::mediaviewVolumeLeft - _fullScreenToggle->width() - st::mediaviewFullScreenLeft, st::mediaviewSeekSize.height()); _playback->moveToLeft(st::mediaviewPlayPauseLeft + _playPauseResume->width() + playTop, st::mediaviewPlaybackTop); _playedAlready->moveToLeft(st::mediaviewPlayPauseLeft + _playPauseResume->width() + playTop, st::mediaviewPlayProgressTop); diff --git a/Telegram/SourceFiles/media/view/mediaview.style b/Telegram/SourceFiles/media/view/mediaview.style index 4f8938ac71..ef83075fce 100644 --- a/Telegram/SourceFiles/media/view/mediaview.style +++ b/Telegram/SourceFiles/media/view/mediaview.style @@ -40,7 +40,7 @@ mediaviewPlayButton: IconButton { overOpacity: mediaviewActiveOpacity; icon: icon { - { "media_play", #ffffff, point(0px, 0px) }, + { "media_play", #ffffff, point(3px, 0px) }, }; iconPosition: point(3px, 1px); downIconPosition: point(3px, 1px); @@ -51,14 +51,15 @@ mediaviewPauseIcon: icon { { "media_pause", #ffffff, point(1px, 1px) } }; mediaviewPlayPauseLeft: 17px; +mediaviewFullScreenLeft: 17px; mediaviewVolumeLeft: 15px; mediaviewFullScreenButton: IconButton(mediaviewPlayButton) { icon: icon { { "media_fullscreen_to", #ffffff, point(0px, 0px) }, }; - iconPosition: point(0px, 0px); - downIconPosition: point(0px, 0px); + iconPosition: point(0px, 1px); + downIconPosition: point(0px, 1px); } mediaviewFullScreenOutIcon: icon { { "media_fullscreen_from", #ffffff, point(0px, 0px) }, @@ -70,12 +71,12 @@ mediaviewPlaybackWidth: 3px; mediaviewPlaybackTop: 28px; mediaviewSeekSize: size(11px, 11px); -mediaviewVolumeSize: size(44px, 18px); +mediaviewVolumeSize: size(44px, 20px); mediaviewVolumeIcon: icon { { "media_volume", mediaviewPlaybackInactive, point(0px, 0px) }, }; mediaviewVolumeOnIcon: icon { { "media_volume", mediaviewPlaybackActive, point(0px, 0px) }, }; -mediaviewVolumeIconTop: 6px; +mediaviewVolumeIconTop: 8px; mediaviewControllerRadius: 25px;