RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed editing caption of album from context menu. 

Fixed #17077.
This commit is contained in:
23rd 2021-10-08 04:55:55 +03:00 committed by John Preston
parent 64aa5480ad
commit ef10bb2bd6
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
View File

@ -408,10 +408,14 @@ TextState GroupedMedia::textState(QPoint point, StateRequest request) const {
- (isBubbleBottom() ? st::msgPadding.bottom() : 0) - (isBubbleBottom() ? st::msgPadding.bottom() : 0)
- _caption.countHeight(captionw); - _caption.countHeight(captionw);
if (QRect(st::msgPadding.left(), captiony, captionw, height() - captiony).contains(point)) { if (QRect(st::msgPadding.left(), captiony, captionw, height() - captiony).contains(point)) {
return TextState(_parent->data(), _caption.getState( return TextState(
point - QPoint(st::msgPadding.left(), captiony), _captionItem
captionw, ? _captionItem
request.forText())); : _parent->data().get(),
_caption.getState(
point - QPoint(st::msgPadding.left(), captiony),
captionw,
request.forText()));
} }
} else if (_parent->media() == this) { } else if (_parent->media() == this) {
auto fullRight = width(); auto fullRight = width();
@ -667,6 +671,7 @@ void GroupedMedia::updateNeedBubbleState() {
if (captionItem) { if (captionItem) {
_caption = createCaption(captionItem); _caption = createCaption(captionItem);
} }
_captionItem = captionItem;
_needBubble = computeNeedBubble(); _needBubble = computeNeedBubble();
} }

1
Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
View File

@ -141,6 +141,7 @@ private:
[[nodiscard]] QMargins groupedPadding() const; [[nodiscard]] QMargins groupedPadding() const;
Ui::Text::String _caption; Ui::Text::String _caption;
HistoryItem *_captionItem = nullptr;
std::vector<Part> _parts; std::vector<Part> _parts;
Mode _mode = Mode::Grid; Mode _mode = Mode::Grid;
bool _needBubble = false; bool _needBubble = false;