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

Prevent some accidental story closing.

Browse source
This commit is contained in:
John Preston 2023-06-27 13:59:36 +04:00
parent aa2cf2f6ca
commit aff094f278
5 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Telegram/SourceFiles/media/stories/media_stories_controller.cpp
View file

@ -505,6 +505,15 @@ ContentLayout Controller::contentLayout() const {
};
}
bool Controller::closeByClickAt(QPoint position) const {
const auto &current = _layout.current();
Assert(current.has_value());
return (position.x() < current->content.x() - st::storiesControlSize)
|| (position.x() > current->content.x() + current->content.width()
+ st::storiesControlSize);
}
Data::FileOrigin Controller::fileOrigin() const {
return Data::FileOriginStory(_shown.peer, _shown.story);
}

1
Telegram/SourceFiles/media/stories/media_stories_controller.h
View file

@ -101,6 +101,7 @@ public:
[[nodiscard]] Layout layout() const;
[[nodiscard]] rpl::producer<Layout> layoutValue() const;
[[nodiscard]] ContentLayout contentLayout() const;
[[nodiscard]] bool closeByClickAt(QPoint position) const;
[[nodiscard]] Data::FileOrigin fileOrigin() const;
[[nodiscard]] TextWithEntities captionText() const;
void showFullCaption();

4
Telegram/SourceFiles/media/stories/media_stories_view.cpp
View file

@ -51,6 +51,10 @@ ContentLayout View::contentLayout() const {
return _controller->contentLayout();
}
bool View::closeByClickAt(QPoint position) const {
return _controller->closeByClickAt(position);
}
void View::updatePlayback(const Player::TrackState &state) {
_controller->updateVideoPlayback(state);
}

1
Telegram/SourceFiles/media/stories/media_stories_view.h
View file

@ -60,6 +60,7 @@ public:
[[nodiscard]] QRect finalShownGeometry() const;
[[nodiscard]] rpl::producer<QRect> finalShownGeometryValue() const;
[[nodiscard]] ContentLayout contentLayout() const;
[[nodiscard]] bool closeByClickAt(QPoint position) const;
[[nodiscard]] SiblingView sibling(SiblingType type) const;
[[nodiscard]] Data::FileOrigin fileOrigin() const;
[[nodiscard]] TextWithEntities captionText() const;

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

@ -5576,7 +5576,9 @@ void OverlayWidget::handleMouseRelease(
|| documentContentShown()
|| !documentBubbleShown()
|| !_docRect.contains(position)) {
close();
if (!_stories || _stories->closeByClickAt(position)) {
close();
}
}
}
_pressed = false;