From 5739b708442d51eeb5594ce287804bb30792da38 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 30 Nov 2020 15:11:24 +0300 Subject: [PATCH] Improve group call popup menu styles. --- Telegram/SourceFiles/calls/calls.style | 24 +++++++++++++------ .../SourceFiles/calls/calls_group_panel.cpp | 2 +- Telegram/lib_ui | 2 +- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style index af1af5dd81..8d7272faa5 100644 --- a/Telegram/SourceFiles/calls/calls.style +++ b/Telegram/SourceFiles/calls/calls.style @@ -411,8 +411,8 @@ groupCallRipple: RippleAnimation(defaultRippleAnimation) { } groupCallMenu: Menu(defaultMenu) { - itemBg: groupCallMembersBgOver; - itemBgOver: groupCallMembersBgRipple; + itemBg: groupCallMenuBg; + itemBgOver: groupCallMenuBgOver; itemFg: groupCallMembersFg; itemFgOver: groupCallMembersFg; itemFgDisabled: groupCallMemberNotJoinedStatus; @@ -424,13 +424,15 @@ groupCallMenu: Menu(defaultMenu) { arrow: icon {{ "dropdown_submenu_arrow", groupCallMemberNotJoinedStatus }}; - ripple: groupCallRipple; + ripple: RippleAnimation(defaultRippleAnimation) { + color: groupCallMenuBgRipple; + } } groupCallMenuShadow: Shadow(defaultEmptyShadow) { - fallback: groupCallMembersBgOver; + fallback: groupCallMenuBg; } groupCallPanelAnimation: PanelAnimation(defaultPanelAnimation) { - fadeBg: groupCallMembersBgOver; + fadeBg: groupCallMenuBg; shadow: groupCallMenuShadow; } groupCallPopupMenu: PopupMenu(defaultPopupMenu) { @@ -565,8 +567,16 @@ groupCallSettings: CallButton(callMicrophoneMute) { color: callMuteRipple; } } - bg: callIconBg; - outerBg: callMuteRipple; +} +groupCallHangup: CallButton(callHangup) { + button: IconButton(callButton) { + icon: icon {{ "calls/call_discard", callIconFg }}; + ripple: RippleAnimation(defaultRippleAnimation) { + color: groupCallLeaveBgRipple; + } + } + bg: groupCallLeaveBg; + outerBg: groupCallLeaveBg; label: callButtonLabel; } groupCallButtonSkip: 43px; diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp index 5763498fa4..4801467885 100644 --- a/Telegram/SourceFiles/calls/calls_group_panel.cpp +++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp @@ -226,7 +226,7 @@ GroupPanel::GroupPanel(not_null call) .text = tr::lng_group_call_connecting(tr::now), .type = Ui::CallMuteButtonType::Connecting, })) -, _hangup(widget(), st::callHangup) { +, _hangup(widget(), st::groupCallHangup) { _layerBg->setStyleOverrides(&st::groupCallBox, &st::groupCallLayerBox); initWindow(); diff --git a/Telegram/lib_ui b/Telegram/lib_ui index e0fb1129d1..5897e357bf 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit e0fb1129d145054410476bd83d1cecf5c2a2644d +Subproject commit 5897e357bfd6114ecede2711831b8c5e9d045fcb