Removed PeerChooseCancel global variable from facades.
This commit is contained in:
parent
daa14466e5
commit
77c8bf8176
|
@ -1617,6 +1617,10 @@ void Widget::updateControlsGeometry() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
rpl::producer<> Widget::closeForwardBarRequests() const {
|
||||||
|
return _closeForwardBarRequests.events();
|
||||||
|
}
|
||||||
|
|
||||||
void Widget::updateForwardBar() {
|
void Widget::updateForwardBar() {
|
||||||
auto selecting = controller()->selectingPeer();
|
auto selecting = controller()->selectingPeer();
|
||||||
auto oneColumnSelecting = (Adaptive::OneColumn() && selecting);
|
auto oneColumnSelecting = (Adaptive::OneColumn() && selecting);
|
||||||
|
@ -1625,8 +1629,8 @@ void Widget::updateForwardBar() {
|
||||||
}
|
}
|
||||||
if (oneColumnSelecting) {
|
if (oneColumnSelecting) {
|
||||||
_forwardCancel.create(this, st::dialogsForwardCancel);
|
_forwardCancel.create(this, st::dialogsForwardCancel);
|
||||||
_forwardCancel->setClickedCallback([] {
|
_forwardCancel->setClickedCallback([=] {
|
||||||
Global::RefPeerChooseCancel().notify(true);
|
_closeForwardBarRequests.fire({});
|
||||||
});
|
});
|
||||||
if (!_a_show.animating()) _forwardCancel->show();
|
if (!_a_show.animating()) _forwardCancel->show();
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -87,6 +87,8 @@ public:
|
||||||
|
|
||||||
void updateForwardBar();
|
void updateForwardBar();
|
||||||
|
|
||||||
|
[[nodiscard]] rpl::producer<> closeForwardBarRequests() const;
|
||||||
|
|
||||||
// Float player interface.
|
// Float player interface.
|
||||||
bool floatPlayerHandleWheelEvent(QEvent *e) override;
|
bool floatPlayerHandleWheelEvent(QEvent *e) override;
|
||||||
QRect floatPlayerAvailableRect() override;
|
QRect floatPlayerAvailableRect() override;
|
||||||
|
@ -245,6 +247,8 @@ private:
|
||||||
|
|
||||||
int _topDelta = 0;
|
int _topDelta = 0;
|
||||||
|
|
||||||
|
rpl::event_stream<> _closeForwardBarRequests;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Dialogs
|
} // namespace Dialogs
|
||||||
|
|
|
@ -356,8 +356,6 @@ struct Data {
|
||||||
base::Observable<void> LocalPasscodeChanged;
|
base::Observable<void> LocalPasscodeChanged;
|
||||||
|
|
||||||
base::Variable<DBIWorkMode> WorkMode = { dbiwmWindowAndTray };
|
base::Variable<DBIWorkMode> WorkMode = { dbiwmWindowAndTray };
|
||||||
|
|
||||||
base::Observable<void> PeerChooseCancel;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace internal
|
} // namespace internal
|
||||||
|
@ -399,6 +397,4 @@ DefineRefVar(Global, base::Observable<void>, LocalPasscodeChanged);
|
||||||
|
|
||||||
DefineRefVar(Global, base::Variable<DBIWorkMode>, WorkMode);
|
DefineRefVar(Global, base::Variable<DBIWorkMode>, WorkMode);
|
||||||
|
|
||||||
DefineRefVar(Global, base::Observable<void>, PeerChooseCancel);
|
|
||||||
|
|
||||||
} // namespace Global
|
} // namespace Global
|
||||||
|
|
|
@ -129,8 +129,6 @@ DeclareRefVar(base::Observable<void>, LocalPasscodeChanged);
|
||||||
|
|
||||||
DeclareRefVar(base::Variable<DBIWorkMode>, WorkMode);
|
DeclareRefVar(base::Variable<DBIWorkMode>, WorkMode);
|
||||||
|
|
||||||
DeclareRefVar(base::Observable<void>, PeerChooseCancel);
|
|
||||||
|
|
||||||
} // namespace Global
|
} // namespace Global
|
||||||
|
|
||||||
namespace Adaptive {
|
namespace Adaptive {
|
||||||
|
|
|
@ -674,6 +674,11 @@ void MainWidget::hiderLayer(base::unique_qptr<Window::HistoryHider> hider) {
|
||||||
_hider = std::move(hider);
|
_hider = std::move(hider);
|
||||||
controller()->setSelectingPeer(true);
|
controller()->setSelectingPeer(true);
|
||||||
|
|
||||||
|
_dialogs->closeForwardBarRequests(
|
||||||
|
) | rpl::start_with_next([=] {
|
||||||
|
_hider->startHide();
|
||||||
|
}, _hider->lifetime());
|
||||||
|
|
||||||
_hider->setParent(this);
|
_hider->setParent(this);
|
||||||
|
|
||||||
_hider->hidden(
|
_hider->hidden(
|
||||||
|
|
|
@ -30,8 +30,6 @@ HistoryHider::HistoryHider(
|
||||||
refreshLang();
|
refreshLang();
|
||||||
}, lifetime());
|
}, lifetime());
|
||||||
|
|
||||||
subscribe(Global::RefPeerChooseCancel(), [=] { startHide(); });
|
|
||||||
|
|
||||||
_chooseWidth = st::historyForwardChooseFont->width(_text);
|
_chooseWidth = st::historyForwardChooseFont->width(_text);
|
||||||
|
|
||||||
resizeEvent(0);
|
resizeEvent(0);
|
||||||
|
|
|
@ -16,7 +16,7 @@ class RoundButton;
|
||||||
|
|
||||||
namespace Window {
|
namespace Window {
|
||||||
|
|
||||||
class HistoryHider : public Ui::RpWidget, private base::Subscriber {
|
class HistoryHider : public Ui::RpWidget {
|
||||||
public:
|
public:
|
||||||
// Forward messages (via drag-n-drop)
|
// Forward messages (via drag-n-drop)
|
||||||
HistoryHider(QWidget *parent, MessageIdsList &&items);
|
HistoryHider(QWidget *parent, MessageIdsList &&items);
|
||||||
|
|
Loading…
Reference in New Issue