diff --git a/Telegram/SourceFiles/media/player/media_player.style b/Telegram/SourceFiles/media/player/media_player.style index e7f50eb289..6c40005c58 100644 --- a/Telegram/SourceFiles/media/player/media_player.style +++ b/Telegram/SourceFiles/media/player/media_player.style @@ -291,7 +291,7 @@ mediaPlayerFileLayout: OverviewFileLayout(overviewFileLayout) { mediaPlayerFloatSize: 128px; mediaPlayerFloatMargin: 12px; -mediaPlayerMenuPosition: point(-2px, 0px); +mediaPlayerMenuPosition: point(-2px, -2px); mediaPlayerOrderMenu: Menu(defaultMenu) { itemIconPosition: point(13px, 8px); itemPadding: margins(49px, 9px, 17px, 11px); diff --git a/Telegram/SourceFiles/media/player/media_player_widget.cpp b/Telegram/SourceFiles/media/player/media_player_widget.cpp index 33aed5f7c9..43ac0a60c6 100644 --- a/Telegram/SourceFiles/media/player/media_player_widget.cpp +++ b/Telegram/SourceFiles/media/player/media_player_widget.cpp @@ -528,17 +528,18 @@ Widget::Widget( hidePlaylistOn(_playPause); hidePlaylistOn(_close); + hidePlaylistOn(_rightControls); setType(AudioMsgId::Type::Song); } -void Widget::hidePlaylistOn(const object_ptr &button) { - button->events( +void Widget::hidePlaylistOn(not_null widget) { + widget->events( ) | rpl::filter([=](not_null e) { return (e->type() == QEvent::Enter); }) | rpl::start_with_next([=] { updateOverLabelsState(false); - }, button->lifetime()); + }, widget->lifetime()); } void Widget::setupRightControls() { diff --git a/Telegram/SourceFiles/media/player/media_player_widget.h b/Telegram/SourceFiles/media/player/media_player_widget.h index ebe6a367eb..bd8debcbe4 100644 --- a/Telegram/SourceFiles/media/player/media_player_widget.h +++ b/Telegram/SourceFiles/media/player/media_player_widget.h @@ -84,7 +84,7 @@ private: [[nodiscard]] int getTimeRight() const; void updateOverLabelsState(QPoint pos); void updateOverLabelsState(bool over); - void hidePlaylistOn(const object_ptr &button); + void hidePlaylistOn(not_null widget); void updatePlayPrevNextPositions(); void updateLabelsGeometry();