diff --git a/Telegram/SourceFiles/boxes/gift_credits_box.cpp b/Telegram/SourceFiles/boxes/gift_credits_box.cpp index a2e36038a..0b20d498e 100644 --- a/Telegram/SourceFiles/boxes/gift_credits_box.cpp +++ b/Telegram/SourceFiles/boxes/gift_credits_box.cpp @@ -39,6 +39,7 @@ void GiftCreditsBox( not_null box, not_null peer, Fn gifted) { + box->setWidth(st::boxWideWidth); box->setStyle(st::creditsGiftBox); box->setNoContentMargin(true); box->addButton(tr::lng_create_group_back(), [=] { box->closeBox(); }); diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp index a8c63b5f8..c620f19d9 100644 --- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp +++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp @@ -256,7 +256,7 @@ void FillCreditOptions( const auto &st = st::creditsTopupButton; const auto diffBetweenTextAndStar = st.padding.left() - st.iconLeft - - singleStarWidth; + - int(singleStarWidth * 1.5); const auto buttonHeight = st.height + rect::m::sum::v(st.padding); const auto minCredits = (!options.empty() && (minimumCredits > options.back().credits)) @@ -283,26 +283,25 @@ void FillCreditOptions( st::creditsTopupPrice); const auto inner = Ui::CreateChild(button); const auto stars = Ui::GenerateStars(st.height, (i + 1)); + const auto textLeft = diffBetweenTextAndStar + + stars.width() / style::DevicePixelRatio(); inner->paintRequest( ) | rpl::start_with_next([=](const QRect &rect) { auto p = QPainter(inner); p.drawImage(0, 0, stars); - const auto textLeft = diffBetweenTextAndStar - + stars.width() / style::DevicePixelRatio(); p.setPen(st.textFg); text->draw(p, { .position = QPoint(textLeft, 0), .availableWidth = inner->width() - textLeft, + .elisionLines = 1, }); }, inner->lifetime()); - button->sizeValue( - ) | rpl::start_with_next([=](const QSize &size) { + button->widthValue( + ) | rpl::start_with_next([=](int width) { price->moveToRight(st.padding.right(), st.padding.top()); inner->moveToLeft(st.iconLeft, st.padding.top()); inner->resize( - size.width() - - rect::m::sum::h(st.padding) - - price->width(), + width - price->width() - st.padding.left(), buttonHeight); }, button->lifetime()); button->setClickedCallback([=] {