kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Report PopupMenu appearing state.

Browse source
This commit is contained in:
John Preston 2022-08-18 10:22:55 +03:00
parent a76cdf7edf
commit a096628b4c
2 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
ui/widgets/popup_menu.cpp
View file

@ -428,10 +428,23 @@ void PopupMenu::paintEvent(QPaintEvent *e) {
QPainter p(this); QPainter p(this);
if (_a_show.animating()) { if (_a_show.animating()) {
if (auto opacity = _a_opacity.value(_hiding ? 0. : 1.)) { const auto opacity = _a_opacity.value(_hiding ? 0. : 1.);
_showAnimation->paintFrame(p, 0, 0, width(), _a_show.value(1.), opacity); const auto progress = _a_show.value(1.);
if (opacity) {
_showAnimation->paintFrame(p, 0, 0, width(), progress, opacity);
} }
_showStateChanges.fire({
.opacity = opacity,
.progress = progress,
.appearing = true,
});
} else if (_a_opacity.animating()) { } else if (_a_opacity.animating()) {
if (_showAnimation) {
_showAnimation.reset();
_showStateChanges.fire({
.toggling = true,
});
}
p.setOpacity(_a_opacity.value(0.)); p.setOpacity(_a_opacity.value(0.));
p.drawPixmap(0, 0, _cache); p.drawPixmap(0, 0, _cache);
} else if (_hiding || isHidden()) { } else if (_hiding || isHidden()) {
@ -439,6 +452,7 @@ void PopupMenu::paintEvent(QPaintEvent *e) {
} else if (_showAnimation) { } else if (_showAnimation) {
_showAnimation->paintFrame(p, 0, 0, width(), 1., 1.); _showAnimation->paintFrame(p, 0, 0, width(), 1., 1.);
_showAnimation.reset(); _showAnimation.reset();
_showStateChanges.fire({});
PostponeCall(this, [=] { showChildren(); }); PostponeCall(this, [=] { showChildren(); });
} else { } else {
paintBg(p); paintBg(p);
@ -681,10 +695,20 @@ void PopupMenu::prepareCache() {
auto showAnimation = base::take(_a_show); auto showAnimation = base::take(_a_show);
auto showAnimationData = base::take(_showAnimation); auto showAnimationData = base::take(_showAnimation);
if (showAnimation.animating()) {
_showStateChanges.fire({});
}
showChildren(); showChildren();
_cache = GrabWidget(this); _cache = GrabWidget(this);
_showAnimation = base::take(showAnimationData); _showAnimation = base::take(showAnimationData);
_a_show = base::take(showAnimation); _a_show = base::take(showAnimation);
if (_a_show.animating()) {
_showStateChanges.fire({
.opacity = _a_opacity.value(1.),
.progress = _a_show.value(1.),
.appearing = true,
});
}
} }
void PopupMenu::startOpacityAnimation(bool hiding) { void PopupMenu::startOpacityAnimation(bool hiding) {
@ -749,6 +773,11 @@ void PopupMenu::startShowAnimation() {
} }
hideChildren(); hideChildren();
_a_show.start([this] { showAnimationCallback(); }, 0., 1., _st.showDuration); _a_show.start([this] { showAnimationCallback(); }, 0., 1., _st.showDuration);
_showStateChanges.fire({
.opacity = _a_opacity.value(1.),
.progress = _a_show.value(1.),
.appearing = true,
});
} }
void PopupMenu::opacityAnimationCallback() { void PopupMenu::opacityAnimationCallback() {
@ -825,6 +854,10 @@ bool PopupMenu::useTransparency() const {
return _useTransparency; return _useTransparency;
} }
rpl::producer<PopupMenu::ShowState> PopupMenu::showStateValue() const {
return _showStateChanges.events();
}
bool PopupMenu::prepareGeometryFor(const QPoint &p) { bool PopupMenu::prepareGeometryFor(const QPoint &p) {
return prepareGeometryFor(p, nullptr); return prepareGeometryFor(p, nullptr);
} }

10
ui/widgets/popup_menu.h
View file

@ -32,6 +32,7 @@ public:
PopupMenu(QWidget *parent, const style::PopupMenu &st = st::defaultPopupMenu); PopupMenu(QWidget *parent, const style::PopupMenu &st = st::defaultPopupMenu);
PopupMenu(QWidget *parent, QMenu *menu, const style::PopupMenu &st = st::defaultPopupMenu); PopupMenu(QWidget *parent, QMenu *menu, const style::PopupMenu &st = st::defaultPopupMenu);
~PopupMenu();
[[nodiscard]] const style::PopupMenu &st() const { [[nodiscard]] const style::PopupMenu &st() const {
return _st; return _st;
@ -86,7 +87,13 @@ public:
return _menu; return _menu;
} }
~PopupMenu(); struct ShowState {
float64 opacity = 1.;
float64 progress = 1.;
bool appearing = false;
bool toggling = false;
};
[[nodiscard]] rpl::producer<ShowState> showStateValue() const;
protected: protected:
void paintEvent(QPaintEvent *e) override; void paintEvent(QPaintEvent *e) override;
@ -173,6 +180,7 @@ private:
std::optional<PanelAnimation::Origin> _forcedOrigin; std::optional<PanelAnimation::Origin> _forcedOrigin;
std::unique_ptr<PanelAnimation> _showAnimation; std::unique_ptr<PanelAnimation> _showAnimation;
Animations::Simple _a_show; Animations::Simple _a_show;
rpl::event_stream<ShowState> _showStateChanges;
bool _useTransparency = true; bool _useTransparency = true;
bool _hiding = false; bool _hiding = false;