procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Show Info if writing is forbidden.

This commit is contained in:
John Preston 2017-09-19 22:44:34 +03:00
parent 48cbdd9d40
commit 1a4d326abb
7 changed files with 68 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Telegram/SourceFiles/auth_session.cpp
View File

@ -169,6 +169,7 @@ void AuthSessionData::setTabbedSelectorSectionEnabled(bool enabled) {
if (enabled) {
setThirdSectionInfoEnabled(false);
}
setTabbedReplacedWithInfo(false);
}
void AuthSessionData::setThirdSectionInfoEnabled(bool enabled) {
@ -177,10 +178,18 @@ void AuthSessionData::setThirdSectionInfoEnabled(bool enabled) {
if (enabled) {
setTabbedSelectorSectionEnabled(false);
}
setTabbedReplacedWithInfo(false);
_thirdSectionInfoEnabledValue.fire_copy(enabled);
}
}
void AuthSessionData::setTabbedReplacedWithInfo(bool enabled) {
if (_tabbedReplacedWithInfo != enabled) {
_tabbedReplacedWithInfo = enabled;
_tabbedReplacedWithInfoValue.fire_copy(enabled);
}
}
QString AuthSessionData::getSoundPath(const QString &key) const {
auto it = _variables.soundOverrides.constFind(key);
if (it != _variables.soundOverrides.end()) {

10
Telegram/SourceFiles/auth_session.h
View File

@ -110,6 +110,14 @@ public:
return _thirdSectionInfoEnabledValue.events_starting_with(
thirdSectionInfoEnabled());
}
bool tabbedReplacedWithInfo() const {
return _tabbedReplacedWithInfo;
}
void setTabbedReplacedWithInfo(bool enabled);
rpl::producer<bool> tabbedReplacedWithInfoValue() const {
return _tabbedReplacedWithInfoValue.events_starting_with(
tabbedReplacedWithInfo());
}
void setSmallDialogsList(bool enabled) {
_variables.smallDialogsList = enabled;
}
@ -183,6 +191,8 @@ private:
base::Observable<void> _pendingHistoryResize;
base::Observable<ItemVisibilityQuery> _queryItemVisibility;
rpl::event_stream<bool> _thirdSectionInfoEnabledValue;
bool _tabbedReplacedWithInfo = false;
rpl::event_stream<bool> _tabbedReplacedWithInfoValue;
Variables _variables;
TimeMs _lastTimeVideoPlayedAt = 0;

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

@ -3760,7 +3760,12 @@ void HistoryWidget::topBarClick() {
void HistoryWidget::pushTabbedSelectorToThirdSection() {
if (!_history || !_tabbedPanel) {
return;
} else if (!_canSendMessages) {
Auth().data().setTabbedReplacedWithInfo(true);
controller()->showPeerInfo(_peer);
return;
}
Auth().data().setTabbedReplacedWithInfo(false);
_tabbedSelectorToggle->setColorOverrides(
&st::historyAttachEmojiActive,
&st::historyRecordVoiceFgActive,
@ -5899,6 +5904,7 @@ void HistoryWidget::fullPeerUpdated(PeerData *peer) {
bool newCanSendMessages = canSendMessages(_peer);
if (newCanSendMessages != _canSendMessages) {
_canSendMessages = newCanSendMessages;
controller()->historyPeerCanWriteChanged().notify(_peer);
if (!_canSendMessages) {
cancelReply();
}
@ -5937,6 +5943,7 @@ void HistoryWidget::handlePeerUpdate() {
bool newCanSendMessages = canSendMessages(_peer);
if (newCanSendMessages != _canSendMessages) {
_canSendMessages = newCanSendMessages;
controller()->historyPeerCanWriteChanged().notify(_peer);
if (!_canSendMessages) {
cancelReply();
}

35
Telegram/SourceFiles/mainwidget.cpp
View File

@ -169,13 +169,10 @@ MainWidget::MainWidget(
checkFloatPlayerVisibility();
});
subscribe(_controller->historyPeerChanged(), [this](PeerData *peer) {
if (!peer) {
_thirdSection.destroy();
_thirdShadow.destroy();
} else if (Adaptive::ThreeColumn()
&& Auth().data().thirdSectionInfoEnabled()) {
_controller->showPeerInfo(peer, anim::type::instant);
}
updateThirdColumnToCurrentPeer(peer);
});
subscribe(_controller->historyPeerCanWriteChanged(), [this](PeerData *peer) {
updateThirdColumnToCurrentPeer(peer);
});
QCoreApplication::instance()->installEventFilter(this);
@ -3529,6 +3526,30 @@ void MainWidget::updateDialogsWidthAnimated() {
}
}
void MainWidget::updateThirdColumnToCurrentPeer(PeerData *peer) {
if (Adaptive::ThreeColumn()
&& Auth().data().tabbedSelectorSectionEnabled()
&& peer) {
if (!peer->canWrite()) {
_controller->showPeerInfo(peer);
Auth().data().setTabbedSelectorSectionEnabled(true);
Auth().data().setTabbedReplacedWithInfo(true);
} else if (Auth().data().tabbedReplacedWithInfo()) {
Auth().data().setTabbedReplacedWithInfo(false);
_history->pushTabbedSelectorToThirdSection();
}
} else {
Auth().data().setTabbedReplacedWithInfo(false);
if (!peer) {
_thirdSection.destroy();
_thirdShadow.destroy();
} else if (Adaptive::ThreeColumn()
&& Auth().data().thirdSectionInfoEnabled()) {
_controller->showPeerInfo(peer, anim::type::instant);
}
}
}
void MainWidget::updateMediaPlayerPosition() {
_playerPanel->moveToRight(0, 0);
if (_player && _playerVolume) {

1
Telegram/SourceFiles/mainwidget.h
View File

@ -500,6 +500,7 @@ private:
void updateMediaPlaylistPosition(int x);
void updateControlsGeometry();
void updateDialogsWidthAnimated();
void updateThirdColumnToCurrentPeer(PeerData *peer);
void createPlayer();
void switchToPanelPlayer();

13
Telegram/SourceFiles/window/top_bar_widget.cpp
View File

@ -20,6 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
*/
#include "window/top_bar_widget.h"
#include <rpl/combine.h>
#include "styles/style_window.h"
#include "boxes/add_contact_box.h"
#include "boxes/confirm_box.h"
@ -100,9 +101,11 @@ TopBarWidget::TopBarWidget(
subscribe(Global::RefPhoneCallsEnabledChanged(), [this] {
updateControlsVisibility(); });
Auth().data().thirdSectionInfoEnabledValue()
rpl::combine(
Auth().data().thirdSectionInfoEnabledValue(),
Auth().data().tabbedReplacedWithInfoValue())
| rpl::start(
[this](bool) { updateInfoToggleActive(); },
[this](auto&&) { updateInfoToggleActive(); },
lifetime());
setCursor(style::cur_pointer);
@ -185,7 +188,8 @@ void TopBarWidget::showMenu() {
void TopBarWidget::toggleInfoSection() {
if (Adaptive::ThreeColumn()
&& Auth().data().thirdSectionInfoEnabled()) {
&& (Auth().data().thirdSectionInfoEnabled()
|| Auth().data().tabbedReplacedWithInfo())) {
_controller->closeThirdSection();
} else if (auto peer = App::main()->historyPeer()) {
if (_controller->canShowThirdSection()) {
@ -474,7 +478,8 @@ void TopBarWidget::updateAdaptiveLayout() {
void TopBarWidget::updateInfoToggleActive() {
auto infoThirdActive = Adaptive::ThreeColumn()
&& Auth().data().thirdSectionInfoEnabled();
&& (Auth().data().thirdSectionInfoEnabled()
|| Auth().data().tabbedReplacedWithInfo());
auto iconOverride = infoThirdActive
? &st::topBarInfoActive
: nullptr;

4
Telegram/SourceFiles/window/window_controller.h
View File

@ -63,6 +63,9 @@ public:
base::Observable<PeerData*> &historyPeerChanged() {
return _historyPeerChanged;
}
base::Observable<PeerData*> &historyPeerCanWriteChanged() {
return _historyPeerCanWriteChanged;
}
void enableGifPauseReason(GifPauseReason reason);
void disableGifPauseReason(GifPauseReason reason);
@ -152,6 +155,7 @@ private:
base::Observable<PeerData*> _searchInPeerChanged;
base::Observable<PeerData*> _historyPeerChanged;
base::Observable<PeerData*> _historyPeerCanWriteChanged;
GifPauseReasons _gifPauseReasons = 0;
base::Observable<void> _gifPauseLevelChanged;