diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index ec547dc79..79f153cd3 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -4953,7 +4953,10 @@ void HistoryWidget::updateHistoryGeometry(bool initial, bool loadedDown, const S } _fieldAutocomplete->setBoundings(_scroll->geometry()); - _historyDown->moveToRight(st::historyToDownPosition.x(), _scroll->y() + _scroll->height() - _historyDown->height() - st::historyToDownPosition.y()); + if (!_historyDownShown.animating()) { + // _historyDown is a child widget of _scroll, not me. + _historyDown->moveToRight(st::historyToDownPosition.x(), _scroll->height() - _historyDown->height() - st::historyToDownPosition.y()); + } controller()->floatPlayerAreaUpdated().notify(true); } @@ -5143,6 +5146,7 @@ void HistoryWidget::updateBotKeyboard(History *h, bool force) { } void HistoryWidget::updateHistoryDownPosition() { + // _historyDown is a child widget of _scroll, not me. auto top = anim::interpolate(0, _historyDown->height() + st::historyToDownPosition.y(), _historyDownShown.current(_historyDownIsShown ? 1. : 0.)); _historyDown->moveToRight(st::historyToDownPosition.x(), _scroll->height() - top); auto shouldBeHidden = !_historyDownIsShown && !_historyDownShown.animating();