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

Resize scroll area together with pinned root message.

This commit is contained in:
John Preston 2020-09-21 20:07:52 +03:00
parent b097bd7225
commit e021e0beb3
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Telegram/SourceFiles/history/view/history_view_replies_section.cpp
View File

@ -337,6 +337,15 @@ void RepliesWidget::setupRootView() {
_rootShadow->showOn(_rootView->shownValue());
_rootView->hide(anim::type::instant);
_rootViewHeight = 0;
_rootView->heightValue(
) | rpl::start_with_next([=](int height) {
if (const auto delta = height - _rootViewHeight) {
_rootViewHeight = height;
setGeometryWithTopMoved(geometry(), delta);
}
}, _rootView->lifetime());
}
void RepliesWidget::setupCommentsRoot() {
@ -1369,7 +1378,8 @@ void RepliesWidget::updateControlsGeometry() {
const auto bottom = height();
const auto controlsHeight = _composeControls->heightCurrent();
const auto scrollHeight = bottom - _topBar->height() - controlsHeight;
const auto scrollY = _topBar->height() + _rootView->height();
const auto scrollHeight = bottom - scrollY - controlsHeight;
const auto scrollSize = QSize(contentWidth, scrollHeight);
if (_scroll->size() != scrollSize) {
_skipScrollEvent = true;
@ -1377,6 +1387,7 @@ void RepliesWidget::updateControlsGeometry() {
_inner->resizeToWidth(scrollSize.width(), _scroll->height());
_skipScrollEvent = false;
}
_scroll->move(0, scrollY);
if (!_scroll->isHidden()) {
if (newScrollTop) {
_scroll->scrollToY(*newScrollTop);

1
Telegram/SourceFiles/history/view/history_view_replies_section.h
View File

@ -247,6 +247,7 @@ private:
Ui::Text::String _rootTitle;
Ui::Text::String _rootMessage;
object_ptr<Ui::SlideWrap<Ui::RpWidget>> _rootView;
int _rootViewHeight = 0;
object_ptr<Ui::PlainShadow> _rootShadow;
std::unique_ptr<Ui::ScrollArea> _scroll;