FOSS/AyuGramDesktop
1
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2026-07-25 06:54:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support 3/4/5 buttons in group call layout.

Browse Source
This commit is contained in:
John Preston
2025-09-30 12:40:18 +04:00
parent ec4deb87c6
commit d3da830ef8
4 changed files with 76 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Telegram/SourceFiles/calls/calls.style
+20 -10
View File
@@ -260,8 +260,10 @@ callMuteButtonLabel: FlatLabel(defaultFlatLabel) {
}
}
callMuteButtonActiveInner: IconButton {
width: 112px;
height: 138px;
// width: 112px;
// height: 138px;
width: 68px;
height: 79px;
}
callMuteButtonSmallActiveInner: IconButton {
width: 68px;
@@ -270,11 +272,15 @@ callMuteButtonSmallActiveInner: IconButton {
callMuteButtonActive: CallButton {
button: callMuteButtonActiveInner;
bg: groupCallLive1;
bgSize: 77px;
bgPosition: point(18px, 18px);
outerRadius: 18px;
// bgSize: 77px;
// bgPosition: point(18px, 18px);
// outerRadius: 18px;
bgSize: 42px;
bgPosition: point(13px, 13px);
outerRadius: 13px;
outerBg: callAnswerBgOuter;
label: callMuteButtonLabel;
//label: callMuteButtonLabel;
label: callButtonLabel;
}
callMuteButton: CallMuteButton {
active: callMuteButtonActive;
@@ -286,10 +292,14 @@ callMuteButton: CallMuteButton {
sublabel: FlatLabel(defaultFlatLabel) {
textFg: groupCallMemberNotJoinedStatus;
}
labelsSkip: 8px;
sublabelSkip: 14px;
lottieSize: size(54px, 54px);
lottieTop: 31px;
labelsSkip: 0px;
sublabelSkip: 0px;
// labelsSkip: 8px;
// sublabelSkip: 14px;
lottieSize: size(36px, 36px);
lottieTop: 17px;
// lottieSize: size(54px, 54px);
// lottieTop: 31px;
}
callMuteButtonSmallActive: CallButton(callMuteButtonActive) {
button: callMuteButtonSmallActiveInner;
Telegram/SourceFiles/calls/group/calls_group_panel.cpp
+52 -28
View File
@@ -599,6 +599,7 @@ void Panel::initControls() {
}, _mute->lifetime());
initShareAction();
createMessageButton();
refreshLeftButton();
refreshVideoButtons();
@@ -709,6 +710,19 @@ void Panel::refreshLeftButton() {
updateButtonsStyles();
}
rpl::producer<Ui::CallButtonColors> Panel::toggleableOverrides(
rpl::producer<bool> active) {
return rpl::combine(
std::move(active),
_mute->colorOverrides()
) | rpl::map([](bool active, Ui::CallButtonColors colors) {
if (active && colors.bg) {
colors.bg->setAlpha(kOverrideActiveColorBgAlpha);
}
return colors;
});
}
void Panel::refreshVideoButtons(std::optional<bool> overrideWideMode) {
const auto create = overrideWideMode.value_or(mode() == PanelMode::Wide)
|| (!_call->scheduleDate() && _call->videoIsWorking());
@@ -723,17 +737,6 @@ void Panel::refreshVideoButtons(std::optional<bool> overrideWideMode) {
}
return;
}
auto toggleableOverrides = [&](rpl::producer<bool> active) {
return rpl::combine(
std::move(active),
_mute->colorOverrides()
) | rpl::map([](bool active, Ui::CallButtonColors colors) {
if (active && colors.bg) {
colors.bg->setAlpha(kOverrideActiveColorBgAlpha);
}
return colors;
});
};
if (!_video) {
_video.create(
widget(),
@@ -778,6 +781,12 @@ void Panel::refreshVideoButtons(std::optional<bool> overrideWideMode) {
_wideMenu->setColorOverrides(
toggleableOverrides(_wideMenuShown.value()));
}
updateButtonsStyles();
updateButtonsGeometry();
raiseControls();
}
void Panel::createMessageButton() {
if (!_message) {
_message.create(
widget(),
@@ -788,9 +797,6 @@ void Panel::refreshVideoButtons(std::optional<bool> overrideWideMode) {
_message->setColorOverrides(
toggleableOverrides(_messageTyping.value()));
}
updateButtonsStyles();
updateButtonsGeometry();
raiseControls();
}
void Panel::hideStickedTooltip(StickedTooltipHide hide) {
@@ -2508,11 +2514,21 @@ void Panel::updateButtonsGeometry() {
refreshTitleGeometry();
}
} else {
const auto addSkip = st::callMuteButton.active.outerRadius;
const auto muteSize = _mute->innerSize().width();
const auto single = (_settings ? _settings : _callShare)->width();
const auto five = !_callShare && _message;
const auto showVideoButton = videoButtonInNarrowMode();
const auto four = !_callShare && !showVideoButton && _message;
const auto five = !four && !_callShare && _message;
const auto buttonSkip = four
? (st::groupCallButtonSkip / 2)
: five
? ((st::groupCallWidth - 5 * single) / 6)
: st::groupCallButtonSkip;
const auto fullWidth = five
? st::groupCallWidth
: four
? (4 * single + 3 * buttonSkip)
: (muteSize + 2 * (single + st::groupCallButtonSkip));
const auto forMessagesWidth = st::groupCallWidth
- st::groupCallMembersMargin.left()
@@ -2525,16 +2541,21 @@ void Panel::updateButtonsGeometry() {
_messageField->resizeToWidth(forMessagesWidth);
const auto height = _messageField->height();
messagesBottomSkip += height
+ std::min(height, existingBottomSkip / 3);
messagesBottomSkip += height;
const auto y = widget()->height() - messagesBottomSkip;
const auto y = widget()->height()
- messagesBottomSkip
- (existingBottomSkip / 3);
_messageField->move(forMessagesLeft, y);
}
const auto muteTop = widget()->height()
const auto buttonsTop = widget()->height()
- messagesBottomSkip
- st::groupCallMuteBottomSkip;
- st::groupCallButtonBottomSkip;
const auto muteTop = buttonsTop + addSkip;
//const auto muteTop = widget()->height()
// - messagesBottomSkip
// - st::groupCallMuteBottomSkip;
const auto forMessagesBottom = muteTop
- (existingBottomSkip / 3);
const auto forMessagesHeight = forMessagesBottom
@@ -2547,20 +2568,21 @@ void Panel::updateButtonsGeometry() {
forMessagesWidth,
forMessagesHeight);
const auto buttonsTop = widget()->height()
- messagesBottomSkip
- st::groupCallButtonBottomSkip;
toggle(_mute, true);
_mute->moveInner({ (widget()->width() - muteSize) / 2, muteTop });
const auto leftButtonLeft = (widget()->width() - fullWidth) / 2;
const auto nextButtonLeft = leftButtonLeft + (five ? single : 0);
const auto leftButtonLeft = (widget()->width() - fullWidth) / 2
+ (five ? buttonSkip : 0);
const auto nextButtonLeft = leftButtonLeft
+ ((five || four) ? (single + buttonSkip) : 0);
const auto muteButtonLeft = four
? (nextButtonLeft + addSkip)
: ((widget()->width() - muteSize) / 2);
_mute->moveInner({ muteButtonLeft, muteTop });
//toggle(_screenShare, false);
toggle(_wideMenu, false);
toggle(_callShare, true);
if (_callShare) {
_callShare->moveToLeft(leftButtonLeft, buttonsTop);
}
const auto showVideoButton = videoButtonInNarrowMode();
toggle(_video, !_callShare && showVideoButton);
if (_video) {
_video->setStyle(st::groupCallVideo, &st::groupCallVideoActive);
@@ -2568,7 +2590,9 @@ void Panel::updateButtonsGeometry() {
}
toggle(_settings, !_callShare && (five || !showVideoButton));
if (_settings) {
_settings->moveToLeft(nextButtonLeft, buttonsTop);
_settings->moveToLeft(
four ? leftButtonLeft : nextButtonLeft,
buttonsTop);
}
toggle(_message, !_callShare);
if (_message) {
Telegram/SourceFiles/calls/group/calls_group_panel.h
+4
View File
@@ -44,6 +44,7 @@ class PaddingWrap;
class ScrollArea;
class GenericBox;
class GroupCallScheduledLeft;
struct CallButtonColors;
} // namespace Ui
namespace Ui::Toast {
@@ -159,6 +160,7 @@ private:
void setupControlsBackgroundWide();
void setupControlsBackgroundNarrow();
void showControls();
void createMessageButton();
void refreshLeftButton();
void refreshVideoButtons(
std::optional<bool> overrideWideMode = std::nullopt);
@@ -170,6 +172,8 @@ private:
[[nodiscard]] bool videoButtonInNarrowMode() const;
[[nodiscard]] Fn<void()> shareConferenceLinkCallback();
void toggleMessageTyping();
[[nodiscard]] rpl::producer<Ui::CallButtonColors> toggleableOverrides(
rpl::producer<bool> active);
void endCall();
Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
-1
View File
@@ -1025,7 +1025,6 @@ void InnerWidget::flushAlbumReorder() {
_reorderRequestId = 0;
}).fail([=, show = _controller->uiShow()](const MTP::Error &error) {
_reorderRequestId = 0;
show->showToast(tr::lng_error_generic(tr::now));
}).send();
_pendingAlbumReorder = false;