RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Hide three-dot peer menu when peer changes.

This commit is contained in:
John Preston 2017-12-02 15:11:01 +04:00
parent 301aa9572f
commit da77c10f60
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Telegram/SourceFiles/history/history_top_bar_widget.cpp
View File

@ -352,8 +352,7 @@ void HistoryTopBarWidget::backClicked() {
_controller->showBackFromStack(); _controller->showBackFromStack();
} }
void HistoryTopBarWidget::setHistoryPeer( void HistoryTopBarWidget::setHistoryPeer(PeerData *historyPeer) {
not_null<PeerData*> historyPeer) {
if (_historyPeer != historyPeer) { if (_historyPeer != historyPeer) {
_historyPeer = historyPeer; _historyPeer = historyPeer;
update(); update();
@ -367,8 +366,10 @@ void HistoryTopBarWidget::setHistoryPeer(
Ui::UserpicButton::Role::Custom, Ui::UserpicButton::Role::Custom,
st::topBarInfoButton); st::topBarInfoButton);
_info->setAttribute(Qt::WA_TransparentForMouseEvents); _info->setAttribute(Qt::WA_TransparentForMouseEvents);
} else { }
_info.destroy(); if (_menu) {
_menuToggle->removeEventFilter(_menu);
_menu->hideFast();
} }
updateOnlineDisplay(); updateOnlineDisplay();
updateControlsVisibility(); updateControlsVisibility();

2
Telegram/SourceFiles/history/history_top_bar_widget.h
View File

@ -55,7 +55,7 @@ public:
} }
void setAnimationMode(bool enabled); void setAnimationMode(bool enabled);
void setHistoryPeer(not_null<PeerData*> historyPeer); void setHistoryPeer(PeerData *historyPeer);
static void paintUnreadCounter( static void paintUnreadCounter(
Painter &p, Painter &p,

2
Telegram/SourceFiles/history/history_widget.cpp
View File

@ -1739,11 +1739,11 @@ void HistoryWidget::showHistory(const PeerId &peerId, MsgId showAtMsgId, bool re
if (peerId) { if (peerId) {
_peer = App::peer(peerId); _peer = App::peer(peerId);
_topBar->setHistoryPeer(_peer);
_channel = peerToChannel(_peer->id); _channel = peerToChannel(_peer->id);
_canSendMessages = canSendMessages(_peer); _canSendMessages = canSendMessages(_peer);
_tabbedSelector->setCurrentPeer(_peer); _tabbedSelector->setCurrentPeer(_peer);
} }
_topBar->setHistoryPeer(_peer);
updateTopBarSelection(); updateTopBarSelection();
if (_peer && _peer->isChannel()) { if (_peer && _peer->isChannel()) {