mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-30 22:16:14 +00:00
Code Issues Releases Wiki Activity

fixed merge with master

Browse Source
This commit is contained in:
John Preston
2015-09-03 14:47:16 +03:00
parent f24b5fc35b
commit e8ab968e5a
7 changed files with 5 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/overviewwidget.cpp
View File

@@ -2389,7 +2389,7 @@ void OverviewInner::itemResized(HistoryItem *item, bool scrollToIt) {
_items[j].y += newh;
}
_height = _items[l - 1].y;
_addToY = (_type == OverviewAudioDocuments) ? st::playlistPadding : ((_height < _minHeight) ? (_minHeight - _height) : 0);
_addToY = (_height < _minHeight) ? (_minHeight - _height) : 0;
resize(width(), _minHeight > _height ? _minHeight : _height);
if (scrollToIt) {
if (_addToY + _height - from > _scroll->scrollTop() + _scroll->height()) {
@@ -2475,7 +2475,7 @@ void OverviewInner::showAll(bool recountHeights) {
newHeight = _height;
_addToY = (_height < _minHeight) ? (_minHeight - _height) : 0;
}
_addToY = (_type == OverviewAudioDocuments) ? st::playlistPadding : ((_height < _minHeight) ? (_minHeight - _height) : 0);
if (newHeight < _minHeight) {
newHeight = _minHeight;
}