procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix removing photo in webpage preview.

This commit is contained in:
John Preston 2019-03-14 17:14:18 +04:00
parent 5cae57601a
commit a5d1fbff98
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Telegram/SourceFiles/history/media/history_media_web_page.cpp
View File

@ -288,7 +288,7 @@ QSize HistoryWebPage::countCurrentSize(int newWidth) {
auto linesMax = isLogEntryOriginal() ? kMaxOriginalEntryLines : 5; auto linesMax = isLogEntryOriginal() ? kMaxOriginalEntryLines : 5;
auto siteNameLines = _siteNameWidth ? 1 : 0; auto siteNameLines = _siteNameWidth ? 1 : 0;
auto siteNameHeight = _siteNameWidth ? lineHeight : 0; auto siteNameHeight = _siteNameWidth ? lineHeight : 0;
if (_asArticle) { if (asArticle()) {
_pixh = linesMax * lineHeight; _pixh = linesMax * lineHeight;
do { do {
_pixw = articleThumbWidth(_data->photo, _pixh); _pixw = articleThumbWidth(_data->photo, _pixh);
@ -406,7 +406,7 @@ void HistoryWebPage::draw(Painter &p, const QRect &r, TextSelection selection, c
auto bshift = padding.bottom(); auto bshift = padding.bottom();
paintw -= padding.left() + padding.right(); paintw -= padding.left() + padding.right();
auto attachAdditionalInfoText = _attach ? _attach->additionalInfoString() : QString(); auto attachAdditionalInfoText = _attach ? _attach->additionalInfoString() : QString();
if (_asArticle) { if (asArticle()) {
bshift += bottomInfoPadding(); bshift += bottomInfoPadding();
} else if (!attachAdditionalInfoText.isEmpty()) { } else if (!attachAdditionalInfoText.isEmpty()) {
bshift += bottomInfoPadding(); bshift += bottomInfoPadding();
@ -418,7 +418,7 @@ void HistoryWebPage::draw(Painter &p, const QRect &r, TextSelection selection, c
p.fillRect(bar, barfg); p.fillRect(bar, barfg);
auto lineHeight = unitedLineHeight(); auto lineHeight = unitedLineHeight();
if (_asArticle) { if (asArticle()) {
const auto contextId = _parent->data()->fullId(); const auto contextId = _parent->data()->fullId();
_data->photo->loadThumbnail(contextId); _data->photo->loadThumbnail(contextId);
bool full = _data->photo->thumbnail()->loaded(); bool full = _data->photo->thumbnail()->loaded();
@ -525,6 +525,10 @@ void HistoryWebPage::draw(Painter &p, const QRect &r, TextSelection selection, c
} }
} }
bool HistoryWebPage::asArticle() const {
return _asArticle && (_data->photo != nullptr);
}
TextState HistoryWebPage::textState(QPoint point, StateRequest request) const { TextState HistoryWebPage::textState(QPoint point, StateRequest request) const {
auto result = TextState(_parent); auto result = TextState(_parent);
@ -537,14 +541,14 @@ TextState HistoryWebPage::textState(QPoint point, StateRequest request) const {
auto padding = inBubblePadding(); auto padding = inBubblePadding();
auto tshift = padding.top(); auto tshift = padding.top();
auto bshift = padding.bottom(); auto bshift = padding.bottom();
if (_asArticle || (isBubbleBottom() && _attach && _attach->customInfoLayout() && _attach->width() + _parent->skipBlockWidth() > paintw + bubble.left() + bubble.right())) { if (asArticle() || (isBubbleBottom() && _attach && _attach->customInfoLayout() && _attach->width() + _parent->skipBlockWidth() > paintw + bubble.left() + bubble.right())) {
bshift += bottomInfoPadding(); bshift += bottomInfoPadding();
} }
paintw -= padding.left() + padding.right(); paintw -= padding.left() + padding.right();
auto lineHeight = unitedLineHeight(); auto lineHeight = unitedLineHeight();
auto inThumb = false; auto inThumb = false;
if (_asArticle) { if (asArticle()) {
auto pw = qMax(_pixw, lineHeight); auto pw = qMax(_pixw, lineHeight);
if (rtlrect(padding.left() + paintw - pw, 0, pw, _pixh, width()).contains(point)) { if (rtlrect(padding.left() + paintw - pw, 0, pw, _pixh, width()).contains(point)) {
inThumb = true; inThumb = true;

1
Telegram/SourceFiles/history/media/history_media_web_page.h
View File

@ -95,6 +95,7 @@ private:
QString displayedSiteName() const; QString displayedSiteName() const;
ClickHandlerPtr replaceAttachLink(const ClickHandlerPtr &link) const; ClickHandlerPtr replaceAttachLink(const ClickHandlerPtr &link) const;
bool asArticle() const;
not_null<WebPageData*> _data; not_null<WebPageData*> _data;
std::vector<std::unique_ptr<Data::Media>> _collage; std::vector<std::unique_ptr<Data::Media>> _collage;