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

Fixed closing media viewer in fullscreen mode with click on top area.

Browse source
This commit is contained in:
23rd 2023-03-09 13:13:12 +03:00
parent d961b56a2d
commit 9803342c93
3 changed files with 38 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
View file

@ -474,6 +474,25 @@ OverlayWidget::OverlayWidget()
}
return base::EventFilterResult::Continue;
});
_helper->mouseEvents(
) | rpl::start_with_next([=](not_null<QMouseEvent*> e) {
const auto type = e->type();
const auto position = e->pos();
if (_helper->skipTitleHitTest(position)) {
return;
}
if (type == QEvent::MouseButtonPress) {
handleMousePress(position, e->button());
} else if (type == QEvent::MouseButtonRelease) {
handleMouseRelease(position, e->button());
} else if (type == QEvent::MouseMove) {
handleMouseMove(position);
} else if (type == QEvent::MouseButtonDblClick) {
if (!handleDoubleClick(position, e->button())) {
handleMousePress(position, e->button());
}
}
}, lifetime());
_window->setTitle(u"Media viewer"_q);
_window->setTitleStyle(st::mediaviewTitle);

14
Telegram/SourceFiles/platform/platform_overlay_widget.cpp
View file

@ -234,4 +234,18 @@ void DefaultOverlayWidgetHelper::setControlsOpacity(float64 opacity) {
_buttons->setMasterOpacity(opacity);
}
auto DefaultOverlayWidgetHelper::mouseEvents() const
-> rpl::producer<not_null<QMouseEvent*>> {
return _controls->wrap.events(
) | rpl::filter([](not_null<QEvent*> e) {
const auto type = e->type();
return (type == QEvent::MouseButtonPress)
|| (type == QEvent::MouseButtonRelease)
|| (type == QEvent::MouseMove)
|| (type == QEvent::MouseButtonDblClick);
}) | rpl::map([](not_null<QEvent*> e) {
return not_null{ static_cast<QMouseEvent*>(e.get()) };
});
}
} // namespace Platform

5
Telegram/SourceFiles/platform/platform_overlay_widget.h
View file

@ -49,6 +49,10 @@ public:
}
virtual void setControlsOpacity(float64 opacity) {
}
[[nodiscard]] virtual auto mouseEvents() const
-> rpl::producer<not_null<QMouseEvent*>> {
return rpl::never<not_null<QMouseEvent*>>();
}
};
[[nodiscard]] std::unique_ptr<OverlayWidgetHelper> CreateOverlayWidgetHelper(
@ -68,6 +72,7 @@ public:
void beforeShow(bool fullscreen) override;
void clearState() override;
void setControlsOpacity(float64 opacity) override;
rpl::producer<not_null<QMouseEvent*>> mouseEvents() const override;
private:
class Buttons;