mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-01 15:15:13 +00:00
Code Issues Releases Wiki Activity

Fixes for minimum photo width

Browse Source
This commit is contained in:
RadRussianRus
2019-09-27 04:10:36 +03:00
parent c473b1400a
commit a136f35a59
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@ using "basic.style";
using "dialogs/dialogs.style"; using "dialogs/dialogs.style";
using "ui/widgets/widgets.style"; using "ui/widgets/widgets.style";
minPhotoSize: 200px; minPhotoSize: 100px;
minVideoSize: 160px; minVideoSize: 160px;
maxMediaSize: 430px; maxMediaSize: 430px;
maxStickerSize: 128px; maxStickerSize: 128px;
@@ -371,6 +371,7 @@ botKbScroll: defaultSolidScroll;
historyDateFadeDuration: 200; historyDateFadeDuration: 200;
historyPhotoLeft: 14px; historyPhotoLeft: 14px;
historyPhotoCaptionedMinWidth: 200px;
historyMessageRadius: 6px; historyMessageRadius: 6px;
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

@@ -86,7 +86,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((_caption.isEmpty() ? st::minPhotoSize : st::historyPhotoCaptionedMinWidth), _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);
@@ -125,7 +125,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((_caption.isEmpty() ? st::minPhotoSize : st::historyPhotoCaptionedMinWidth), _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()) {