diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style index 4e1c07c8c..bd6c9c35a 100644 --- a/Telegram/SourceFiles/calls/calls.style +++ b/Telegram/SourceFiles/calls/calls.style @@ -1401,3 +1401,4 @@ groupCallRtmpShowButtonPosition: point(21px, -5px); groupCallRtmpKeyLabel: FlatLabel(boxLabel) { minWidth: 230px; } +groupCallDividerBg: groupCallMembersBgRipple; diff --git a/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp b/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp index 27fc38df0..3f9ba0b88 100644 --- a/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp +++ b/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp @@ -278,9 +278,7 @@ void StartRtmpProcess::FillRtmpRows( auto urlLabelContent = state->url.value(); addLabel(std::move(urlLabelContent)); - container->add(object_ptr( - container, - st::groupCallRtmpUrlSkip)); + Settings::AddSkip(container, st::groupCallRtmpUrlSkip); addButton(false, tr::lng_group_call_rtmp_url_copy()); // @@ -289,9 +287,7 @@ void StartRtmpProcess::FillRtmpRows( } // Stream Key. - container->add(object_ptr( - container, - st::groupCallRtmpKeySubsectionTitleSkip)); + Settings::AddSkip(container, st::groupCallRtmpKeySubsectionTitleSkip); Settings::AddSubsectionTitle( container, diff --git a/Telegram/SourceFiles/calls/group/calls_group_settings.cpp b/Telegram/SourceFiles/calls/group/calls_group_settings.cpp index a929f73d1..083a7f3f6 100644 --- a/Telegram/SourceFiles/calls/group/calls_group_settings.cpp +++ b/Telegram/SourceFiles/calls/group/calls_group_settings.cpp @@ -248,6 +248,14 @@ void SettingsBox( const auto joinMuted = goodReal ? real->joinMuted() : false; const auto canChangeJoinMuted = (goodReal && real->canChangeJoinMuted()); const auto addCheck = (peer->canManageGroupCall() && canChangeJoinMuted); + + const auto addDivider = [&] { + layout->add(object_ptr( + layout, + st::boxDividerHeight, + st::groupCallDividerBg)); + }; + if (addCheck) { AddSkip(layout); } @@ -629,6 +637,10 @@ void SettingsBox( )->addClickHandler(std::move(shareLink)); } if (rtmp) { + AddSkip(layout); + addDivider(); + AddSkip(layout); + struct State { base::unique_qptr menu; mtpRequestId requestId; @@ -699,7 +711,7 @@ void SettingsBox( StartRtmpProcess::FillRtmpRows( - box->verticalLayout(), + layout, false, [=](object_ptr &&object) { box->getDelegate()->show(std::move(object)); @@ -716,6 +728,9 @@ void SettingsBox( &st::groupCallAttentionBoxButton, &st::groupCallPopupMenu); state->data.fire(call->rtmpInfo()); + + addDivider(); + AddSkip(layout); } if (peer->canManageGroupCall()) {