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

Resize message with photo when bubbled

This commit is contained in:
RadRussianRus 2019-09-30 11:46:52 +03:00 committed by John Preston
parent 4669c07dc5
commit 982edcb310
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Telegram/SourceFiles/history/history.style
View File

@ -371,6 +371,7 @@ botKbScroll: defaultSolidScroll;
historyDateFadeDuration: 200; historyDateFadeDuration: 200;
historyPhotoLeft: 14px; historyPhotoLeft: 14px;
historyPhotoBubbleMinWidth: 200px;
historyMessageRadius: roundRadiusLarge; historyMessageRadius: roundRadiusLarge;
historyBubbleTailInLeft: icon {{ "bubble_tail", msgInBg }}; historyBubbleTailInLeft: icon {{ "bubble_tail", msgInBg }};
historyBubbleTailInLeftSelected: icon {{ "bubble_tail", msgInBgSelected }}; historyBubbleTailInLeftSelected: icon {{ "bubble_tail", msgInBgSelected }};

4
Telegram/SourceFiles/history/view/media/history_view_photo.cpp
View File

@ -87,7 +87,7 @@ QSize Photo::countOptimalSize() {
if (_serviceWidth > 0) { if (_serviceWidth > 0) {
return { _serviceWidth, _serviceWidth }; return { _serviceWidth, _serviceWidth };
} }
const auto minWidth = qMax(st::minPhotoSize, _parent->infoWidth() + 2 * (st::msgDateImgDelta + st::msgDateImgPadding.x())); const auto minWidth = qMax((_parent->hasBubble() ? st::historyPhotoBubbleMinWidth : st::minPhotoSize), _parent->infoWidth() + 2 * (st::msgDateImgDelta + st::msgDateImgPadding.x()));
const auto maxActualWidth = qMax(tw, minWidth); const auto maxActualWidth = qMax(tw, minWidth);
maxWidth = qMax(maxActualWidth, th); maxWidth = qMax(maxActualWidth, th);
minHeight = qMax(th, st::minPhotoSize); minHeight = qMax(th, st::minPhotoSize);
@ -127,7 +127,7 @@ QSize Photo::countCurrentSize(int newWidth) {
if (_pixw < 1) _pixw = 1; if (_pixw < 1) _pixw = 1;
if (_pixh < 1) _pixh = 1; if (_pixh < 1) _pixh = 1;
auto minWidth = qMax(st::minPhotoSize, _parent->infoWidth() + 2 * (st::msgDateImgDelta + st::msgDateImgPadding.x())); auto minWidth = qMax((_parent->hasBubble() ? st::historyPhotoBubbleMinWidth : st::minPhotoSize), _parent->infoWidth() + 2 * (st::msgDateImgDelta + st::msgDateImgPadding.x()));
newWidth = qMax(_pixw, minWidth); newWidth = qMax(_pixw, minWidth);
auto newHeight = qMax(_pixh, st::minPhotoSize); auto newHeight = qMax(_pixh, st::minPhotoSize);
if (_parent->hasBubble() && !_caption.isEmpty()) { if (_parent->hasBubble() && !_caption.isEmpty()) {