From 7149119098c3c0b52cccbc67b88b5d632448f901 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Fri, 28 Jul 2023 04:11:12 +0300 Subject: [PATCH] Fixed style of media player controls. --- Telegram/SourceFiles/media/player/media_player.style | 12 ++++++++---- .../SourceFiles/media/player/media_player_widget.cpp | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Telegram/SourceFiles/media/player/media_player.style b/Telegram/SourceFiles/media/player/media_player.style index 841cc3e5c..5e5a3ec8b 100644 --- a/Telegram/SourceFiles/media/player/media_player.style +++ b/Telegram/SourceFiles/media/player/media_player.style @@ -106,7 +106,7 @@ mediaPlayerRepeatButton: IconButton { icon: icon { { "player/player_repeat", mediaPlayerActiveFg } }; - iconPosition: point(3px, 6px); + iconPosition: point(2px, 5px); rippleAreaPosition: point(2px, 6px); rippleAreaSize: 24px; @@ -135,6 +135,10 @@ mediaPlayerReverseDisabledIconOver: icon { mediaPlayerShuffleIcon: icon { { "player/player_shuffle", mediaPlayerActiveFg } }; +mediaPlayerOrderButton: IconButton(mediaPlayerRepeatButton) { + iconPosition: point(2px, 6px); + rippleAreaPosition: point(2px, 6px); +} mediaPlayerRepeatDisabledRippleBg: windowBgOver; mediaPlayerPlayButton: IconButton(mediaPlayerRepeatButton) { @@ -233,7 +237,7 @@ mediaPlayerVolumeToggle: IconButton(mediaPlayerRepeatButton) { { "player/player_mini_full", mediaPlayerActiveFg }, }; iconPosition: point(5px, 6px); - rippleAreaPosition: point(4px, 5px); + rippleAreaPosition: point(5px, 6px); } mediaPlayerVolumeMargin: 10px; mediaPlayerVolumeSize: size(27px, 100px); @@ -267,9 +271,9 @@ mediaPlayerClose: IconButton(mediaPlayerRepeatButton) { width: 39px; icon: icon {{ "player/panel_close", menuIconFg }}; iconOver: icon {{ "player/panel_close", menuIconFgOver }}; - iconPosition: point(5px, 6px); + iconPosition: point(4px, 6px); - rippleAreaPosition: point(4px, 5px); + rippleAreaPosition: point(4px, 6px); ripple: RippleAnimation(defaultRippleAnimation) { color: windowBgOver; } diff --git a/Telegram/SourceFiles/media/player/media_player_widget.cpp b/Telegram/SourceFiles/media/player/media_player_widget.cpp index d9be06b6d..abe1c738c 100644 --- a/Telegram/SourceFiles/media/player/media_player_widget.cpp +++ b/Telegram/SourceFiles/media/player/media_player_widget.cpp @@ -55,7 +55,7 @@ Widget::Widget( , _playPause(this, st::mediaPlayerPlayButton) , _volumeToggle(rightControls(), st::mediaPlayerVolumeToggle) , _repeatToggle(rightControls(), st::mediaPlayerRepeatButton) -, _orderToggle(rightControls(), st::mediaPlayerRepeatButton) +, _orderToggle(rightControls(), st::mediaPlayerOrderButton) , _speedToggle(rightControls(), st::mediaPlayerSpeedButton) , _close(this, st::mediaPlayerClose) , _shadow(this)