diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style index 110d040112..3e2da88101 100644 --- a/Telegram/SourceFiles/boxes/boxes.style +++ b/Telegram/SourceFiles/boxes/boxes.style @@ -1333,7 +1333,6 @@ aiComposeCardPadding: margins(12px, 16px, 16px, 16px); aiComposeCardDivider: shadowFg; aiComposeCardSectionSkip: 12px; aiComposeCardTextSkip: 0px; -aiComposeCardCopySkip: 0px; aiComposeCardControlSkip: 8px; aiComposeCardTitle: FlatLabel(defaultSubsectionTitle) { textFg: windowFg; diff --git a/Telegram/SourceFiles/boxes/compose_ai_box.cpp b/Telegram/SourceFiles/boxes/compose_ai_box.cpp index 577b5dcc59..390ee3563b 100644 --- a/Telegram/SourceFiles/boxes/compose_ai_box.cpp +++ b/Telegram/SourceFiles/boxes/compose_ai_box.cpp @@ -1147,6 +1147,16 @@ int ComposeAiPreviewCard::resizeGetHeight(int newWidth) { }); y += st::aiComposeCardTextSkip; + const auto lineHeight = _resultBody->st().style.lineHeight + ? _resultBody->st().style.lineHeight + : _resultBody->st().style.font->height; + if (_copy->isVisible()) { + _resultBody->setSkipBlock( + _copy->width(), + lineHeight); + } else { + _resultBody->setSkipBlock(0, 0); + } _resultBody->resizeToWidth(contentWidth); _resultBody->setGeometryToLeft( padding.left(), @@ -1154,13 +1164,13 @@ int ComposeAiPreviewCard::resizeGetHeight(int newWidth) { contentWidth, _resultBody->height(), newWidth); - y += _resultBody->height(); - if (_copy->isVisible()) { - y += st::aiComposeCardCopySkip; - _copy->moveToRight(padding.right(), y, newWidth); - y += _copy->height(); + _copy->moveToRight( + padding.right(), + y + _resultBody->height() - lineHeight, + newWidth); } + y += _resultBody->height(); } else { _resultTitle->hide(); diff --git a/Telegram/lib_ui b/Telegram/lib_ui index af87a4bdb5..d105167b70 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit af87a4bdb56ebd191f2eb1b6221673dbea868624 +Subproject commit d105167b7024d57a4e15acc7ddd5767659b53c6b