procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Limit media count in one HistoryGroupedMedia.

Browse source
This commit is contained in:
John Preston 2018-01-30 19:37:24 +03:00
parent 5ebecb4de3
commit edcaccba1f
3 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Telegram/SourceFiles/history/history_media.h
View file

@ -163,13 +163,6 @@ public:
const QRect &geometry,
QPoint point,
StateRequest request) const;
virtual std::unique_ptr<HistoryMedia> takeLastFromGroup() {
return nullptr;
}
virtual bool applyGroup(
const std::vector<not_null<HistoryItem*>> &items) {
return false;
}
virtual bool animating() const {
return false;

19
Telegram/SourceFiles/history/history_media_grouped.cpp
View file

@ -21,8 +21,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "layout.h"
namespace {
using TextState = HistoryView::TextState;
using PointState = HistoryView::PointState;
constexpr auto kMaxDisplayedGroupSize = 10;
} // namespace
HistoryGroupedMedia::Part::Part(not_null<HistoryItem*> item)
@ -34,7 +38,11 @@ HistoryGroupedMedia::HistoryGroupedMedia(
const std::vector<not_null<HistoryItem*>> &items)
: HistoryMedia(parent)
, _caption(st::minPhotoSize - st::msgPadding.left() - st::msgPadding.right()) {
const auto result = applyGroup(items);
const auto result = (items.size() <= kMaxDisplayedGroupSize)
? applyGroup(items)
: applyGroup(std::vector<not_null<HistoryItem*>>(
begin(items),
begin(items) + kMaxDisplayedGroupSize));
Ensures(result);
}
@ -302,12 +310,10 @@ void HistoryGroupedMedia::clickHandlerPressedChanged(
}
}
std::unique_ptr<HistoryMedia> HistoryGroupedMedia::takeLastFromGroup() {
return std::move(_parts.back().content);
}
bool HistoryGroupedMedia::applyGroup(
const std::vector<not_null<HistoryItem*>> &items) {
Expects(items.size() <= kMaxDisplayedGroupSize);
if (items.empty()) {
return false;
}
@ -315,14 +321,13 @@ bool HistoryGroupedMedia::applyGroup(
return true;
}
const auto pushElement = [&](not_null<HistoryItem*> item) {
for (const auto item : items) {
const auto media = item->media();
Assert(media != nullptr && media->canBeGrouped());
_parts.push_back(Part(item));
_parts.back().content = media->createView(_parent, item);
};
ranges::for_each(items, pushElement);
return true;
}

5
Telegram/SourceFiles/history/history_media_grouped.h
View file

@ -59,10 +59,6 @@ public:
const ClickHandlerPtr &p,
bool pressed) override;
std::unique_ptr<HistoryMedia> takeLastFromGroup() override;
bool applyGroup(
const std::vector<not_null<HistoryItem*>> &items) override;
bool hasReplyPreview() const override;
ImagePtr replyPreview() override;
TextWithEntities getCaption() const override;
@ -100,6 +96,7 @@ private:
};
bool applyGroup(const std::vector<not_null<HistoryItem*>> &items);
QSize countOptimalSize() override;
QSize countCurrentSize(int newWidth) override;