RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed mentionsdropdown with pinned message display

This commit is contained in:
John Preston 2016-03-12 19:38:17 +03:00
parent 5aa5a62b74
commit bf5a5fd529
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/dropdown.cpp
View File

@ -4578,10 +4578,10 @@ void MentionsDropdown::recount(bool resetScroll) {
if (h > _boundings.height()) h = _boundings.height();
if (h > maxh) h = maxh;
if (width() != _boundings.width() || height() != h) {
setGeometry(0, _boundings.height() - h, _boundings.width(), h);
setGeometry(_boundings.x(), _boundings.y() + _boundings.height() - h, _boundings.width(), h);
_scroll.resize(_boundings.width(), h);
} else if (y() != _boundings.height() - h) {
move(0, _boundings.height() - h);
} else if (y() != _boundings.y() + _boundings.height() - h) {
move(_boundings.x(), _boundings.y() + _boundings.height() - h);
}
if (resetScroll) st = 0;
if (st != oldst) _scroll.scrollToY(st);

10
Telegram/SourceFiles/historywidget.cpp
View File

@ -6193,11 +6193,15 @@ void HistoryWidget::resizeEvent(QResizeEvent *e) {
_field.move(_attachDocument.x() + _attachDocument.width(), height() - kbh - _field.height() - st::sendPadding);
if (_pinnedBar) {
_scroll.move(0, st::replyHeight);
if (_scroll.y() != st::replyHeight) {
_scroll.move(0, st::replyHeight);
_attachMention.setBoundings(_scroll.geometry());
}
_pinnedBar->cancel.move(width() - _pinnedBar->cancel.width(), 0);
_pinnedBar->shadow.setGeometry(0, st::replyHeight, width(), st::lineWidth);
} else {
_scroll.move(0, _pinnedBar ? st::replyHeight : 0);
} else if (_scroll.y() != 0) {
_scroll.move(0, 0);
_attachMention.setBoundings(_scroll.geometry());
}
_attachDocument.move(0, height() - kbh - _attachDocument.height());