mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-29 13:39:06 +00:00
Code Issues Releases Wiki Activity

Replaced observable in StickersBox with rpl.

Browse Source
This commit is contained in:
23rd 2021-05-25 13:14:12 +03:00
parent 5c7229f875
commit bc9b288617
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Telegram/SourceFiles/boxes/stickers_box.cpp
View File

@ -68,9 +68,7 @@ private:
}; };
// This class is hold in header because it requires Qt preprocessing. // This class is hold in header because it requires Qt preprocessing.
class StickersBox::Inner class StickersBox::Inner : public Ui::RpWidget {
: public Ui::RpWidget
, private base::Subscriber {
public: public:
using Section = StickersBox::Section; using Section = StickersBox::Section;
@ -85,7 +83,9 @@ public:
[[nodiscard]] Main::Session &session() const; [[nodiscard]] Main::Session &session() const;
base::Observable<int> scrollToY; rpl::producer<int> scrollsToY() const {
return _scrollsToY.events();
}
void setInnerFocus(); void setInnerFocus();
void saveGroupSet(); void saveGroupSet();
@ -276,6 +276,8 @@ private:
int _above = -1; int _above = -1;
rpl::event_stream<int> _draggingScrollDelta; rpl::event_stream<int> _draggingScrollDelta;
rpl::event_stream<int> _scrollsToY;
int _minHeight = 0; int _minHeight = 0;
int _scrollbar = 0; int _scrollbar = 0;
@ -387,9 +389,10 @@ StickersBox::StickersBox(
, _section(Section::Installed) , _section(Section::Installed)
, _installed(0, this, controller, megagroup) , _installed(0, this, controller, megagroup)
, _megagroupSet(megagroup) { , _megagroupSet(megagroup) {
subscribe(_installed.widget()->scrollToY, [=](int y) { _installed.widget()->scrollsToY(
) | rpl::start_with_next([=](int y) {
onScrollToY(y); onScrollToY(y);
}); }, lifetime());
} }
StickersBox::StickersBox( StickersBox::StickersBox(
@ -1898,7 +1901,7 @@ void StickersBox::Inner::rebuild() {
void StickersBox::Inner::setMegagroupSelectedSet(const MTPInputStickerSet &set) { void StickersBox::Inner::setMegagroupSelectedSet(const MTPInputStickerSet &set) {
_megagroupSetInput = set; _megagroupSetInput = set;
rebuild(); rebuild();
scrollToY.notify(0, true); _scrollsToY.fire(0);
updateSelected(); updateSelected();
} }