void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-04-22 17:17:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed PeerChooseCancel global variable from facades.

Browse source
This commit is contained in:
23rd 2021-05-25 19:22:46 +03:00
parent daa14466e5
commit 77c8bf8176
7 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Telegram/SourceFiles/dialogs/dialogs_widget.cpp
View file

@ -1617,6 +1617,10 @@ void Widget::updateControlsGeometry() {
}
}
rpl::producer<> Widget::closeForwardBarRequests() const {
return _closeForwardBarRequests.events();
}
void Widget::updateForwardBar() {
auto selecting = controller()->selectingPeer();
auto oneColumnSelecting = (Adaptive::OneColumn() && selecting);
@ -1625,8 +1629,8 @@ void Widget::updateForwardBar() {
}
if (oneColumnSelecting) {
_forwardCancel.create(this, st::dialogsForwardCancel);
_forwardCancel->setClickedCallback([] {
Global::RefPeerChooseCancel().notify(true);
_forwardCancel->setClickedCallback([=] {
_closeForwardBarRequests.fire({});
});
if (!_a_show.animating()) _forwardCancel->show();
} else {

4
Telegram/SourceFiles/dialogs/dialogs_widget.h
View file

@ -87,6 +87,8 @@ public:
void updateForwardBar();
[[nodiscard]] rpl::producer<> closeForwardBarRequests() const;
// Float player interface.
bool floatPlayerHandleWheelEvent(QEvent *e) override;
QRect floatPlayerAvailableRect() override;
@ -245,6 +247,8 @@ private:
int _topDelta = 0;
rpl::event_stream<> _closeForwardBarRequests;
};
} // namespace Dialogs

4
Telegram/SourceFiles/facades.cpp
View file

@ -356,8 +356,6 @@ struct Data {
base::Observable<void> LocalPasscodeChanged;
base::Variable<DBIWorkMode> WorkMode = { dbiwmWindowAndTray };
base::Observable<void> PeerChooseCancel;
};
} // namespace internal
@ -399,6 +397,4 @@ DefineRefVar(Global, base::Observable<void>, LocalPasscodeChanged);
DefineRefVar(Global, base::Variable<DBIWorkMode>, WorkMode);
DefineRefVar(Global, base::Observable<void>, PeerChooseCancel);
} // namespace Global

2
Telegram/SourceFiles/facades.h
View file

@ -129,8 +129,6 @@ DeclareRefVar(base::Observable<void>, LocalPasscodeChanged);
DeclareRefVar(base::Variable<DBIWorkMode>, WorkMode);
DeclareRefVar(base::Observable<void>, PeerChooseCancel);
} // namespace Global
namespace Adaptive {

5
Telegram/SourceFiles/mainwidget.cpp
View file

@ -674,6 +674,11 @@ void MainWidget::hiderLayer(base::unique_qptr<Window::HistoryHider> hider) {
_hider = std::move(hider);
controller()->setSelectingPeer(true);
_dialogs->closeForwardBarRequests(
) | rpl::start_with_next([=] {
_hider->startHide();
}, _hider->lifetime());
_hider->setParent(this);
_hider->hidden(

2
Telegram/SourceFiles/window/window_history_hider.cpp
View file

@ -30,8 +30,6 @@ HistoryHider::HistoryHider(
refreshLang();
}, lifetime());
subscribe(Global::RefPeerChooseCancel(), [=] { startHide(); });
_chooseWidth = st::historyForwardChooseFont->width(_text);
resizeEvent(0);

2
Telegram/SourceFiles/window/window_history_hider.h
View file

@ -16,7 +16,7 @@ class RoundButton;
namespace Window {
class HistoryHider : public Ui::RpWidget, private base::Subscriber {
class HistoryHider : public Ui::RpWidget {
public:
// Forward messages (via drag-n-drop)
HistoryHider(QWidget *parent, MessageIdsList &&items);