kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Show discussion button even when not subscribed

Browse source
This commit is contained in:
Eric Kotato 2020-04-17 16:43:37 +03:00
parent 5b45caadb1
commit e719a0e818
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Telegram/SourceFiles/history/history_widget.cpp
View file

@ -2142,12 +2142,19 @@ void HistoryWidget::updateControlsVisibility() {
} else if (isJoinChannel()) { } else if (isJoinChannel()) {
_unblock->hide(); _unblock->hide();
_muteUnmute->hide(); _muteUnmute->hide();
_discuss->hide();
_botStart->hide(); _botStart->hide();
if (_joinChannel->isHidden()) { if (_joinChannel->isHidden()) {
_joinChannel->clearState(); _joinChannel->clearState();
_joinChannel->show(); _joinChannel->show();
} }
if (hasDiscussionGroup()) {
if (_discuss->isHidden()) {
_discuss->clearState();
_discuss->show();
}
} else {
_discuss->hide();
}
} else if (isMuteUnmute()) { } else if (isMuteUnmute()) {
_unblock->hide(); _unblock->hide();
_joinChannel->hide(); _joinChannel->hide();
@ -4236,9 +4243,13 @@ void HistoryWidget::moveFieldControls() {
_botStart->height()); _botStart->height());
_botStart->setGeometry(fullWidthButtonRect); _botStart->setGeometry(fullWidthButtonRect);
_unblock->setGeometry(fullWidthButtonRect); _unblock->setGeometry(fullWidthButtonRect);
_joinChannel->setGeometry(fullWidthButtonRect);
if (hasDiscussionGroup()) { if (hasDiscussionGroup()) {
_joinChannel->setGeometry(myrtlrect(
0,
fullWidthButtonRect.y(),
width() / 2,
fullWidthButtonRect.height()));
_muteUnmute->setGeometry(myrtlrect( _muteUnmute->setGeometry(myrtlrect(
0, 0,
fullWidthButtonRect.y(), fullWidthButtonRect.y(),
@ -4250,6 +4261,7 @@ void HistoryWidget::moveFieldControls() {
width() - (width() / 2), width() - (width() / 2),
fullWidthButtonRect.height())); fullWidthButtonRect.height()));
} else { } else {
_joinChannel->setGeometry(fullWidthButtonRect);
_muteUnmute->setGeometry(fullWidthButtonRect); _muteUnmute->setGeometry(fullWidthButtonRect);
} }
@ -4985,13 +4997,14 @@ void HistoryWidget::handleHistoryChange(not_null<const History*> history) {
const auto botStart = isBotStart(); const auto botStart = isBotStart();
const auto joinChannel = isJoinChannel(); const auto joinChannel = isJoinChannel();
const auto muteUnmute = isMuteUnmute(); const auto muteUnmute = isMuteUnmute();
const auto discuss = muteUnmute && hasDiscussionGroup(); const auto discuss = (muteUnmute || joinChannel) && hasDiscussionGroup();
const auto update = false const auto update = false
|| (_unblock->isHidden() == unblock) || (_unblock->isHidden() == unblock)
|| (!unblock && _botStart->isHidden() == botStart) || (!unblock && _botStart->isHidden() == botStart)
|| (!unblock || (!unblock
&& !botStart && !botStart
&& _joinChannel->isHidden() == joinChannel) && (_joinChannel->isHidden() == joinChannel
|| _discuss->isHidden() == discuss))
|| (!unblock || (!unblock
&& !botStart && !botStart
&& !joinChannel && !joinChannel
@ -6538,7 +6551,9 @@ void HistoryWidget::handlePeerUpdate() {
} }
if (!_a_show.animating()) { if (!_a_show.animating()) {
if (_unblock->isHidden() == isBlocked() if (_unblock->isHidden() == isBlocked()
|| (!isBlocked() && _joinChannel->isHidden() == isJoinChannel()) || (!isBlocked()
&& _joinChannel->isHidden() == isJoinChannel()
&& _discuss->isHidden() == hasDiscussionGroup())
|| (isMuteUnmute() && _discuss->isHidden() == hasDiscussionGroup())) { || (isMuteUnmute() && _discuss->isHidden() == hasDiscussionGroup())) {
resize = true; resize = true;
} }