diff --git a/Telegram/Resources/icons/settings/mini_gift_order_date.svg b/Telegram/Resources/icons/settings/mini_gift_order_date.svg new file mode 100644 index 0000000000..130d30310f --- /dev/null +++ b/Telegram/Resources/icons/settings/mini_gift_order_date.svg @@ -0,0 +1,12 @@ + + + Mini / mini_gift_sorting2 + + + + + + + + + \ No newline at end of file diff --git a/Telegram/Resources/icons/settings/mini_gift_order_number.svg b/Telegram/Resources/icons/settings/mini_gift_order_number.svg new file mode 100644 index 0000000000..37cc05f572 --- /dev/null +++ b/Telegram/Resources/icons/settings/mini_gift_order_number.svg @@ -0,0 +1,12 @@ + + + Mini / mini_gift_sorting3 + + + + + + + + + \ No newline at end of file diff --git a/Telegram/Resources/icons/settings/mini_gift_order_price.svg b/Telegram/Resources/icons/settings/mini_gift_order_price.svg new file mode 100644 index 0000000000..36409f6b4b --- /dev/null +++ b/Telegram/Resources/icons/settings/mini_gift_order_price.svg @@ -0,0 +1,10 @@ + + + Mini / mini_gift_sorting1 + + + + + + + \ No newline at end of file diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp index fe89376a5f..fae8cc7dd6 100644 --- a/Telegram/SourceFiles/boxes/star_gift_box.cpp +++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp @@ -1078,12 +1078,23 @@ void PreviewWrap::paintEvent(QPaintEvent *e) { } [[nodiscard]] Text::String SortModeText(ResaleSort mode) { - if (mode == ResaleSort::Number) { - return ResaleTabText(tr::lng_gift_resale_number(tr::now)); - } else if (mode == ResaleSort::Price) { - return ResaleTabText(tr::lng_gift_resale_price(tr::now)); - } - return ResaleTabText(tr::lng_gift_resale_date(tr::now)); + auto text = [&] { + if (mode == ResaleSort::Number) { + return Ui::Text::IconEmoji(&st::giftBoxResaleMiniNumber).append( + tr::lng_gift_resale_number(tr::now)); + } else if (mode == ResaleSort::Price) { + return Ui::Text::IconEmoji(&st::giftBoxResaleMiniPrice).append( + tr::lng_gift_resale_price(tr::now)); + } + return Ui::Text::IconEmoji(&st::giftBoxResaleMiniDate).append( + tr::lng_gift_resale_date(tr::now)); + }(); + auto result = Text::String(); + result.setMarkedText( + st::semiboldTextStyle, + text, + kMarkupTextOptions); + return result; } struct ResaleTabs { diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style index 202f8053ac..b06ef54a64 100644 --- a/Telegram/SourceFiles/ui/effects/credits.style +++ b/Telegram/SourceFiles/ui/effects/credits.style @@ -128,6 +128,18 @@ giftBoxResaleTabsDropdown: IconEmoji { icon: icon{{ "intro_country_dropdown", lightButtonFg }}; padding: margins(4px, 6px, 0px, 0px); } +giftBoxResaleMiniNumber: IconEmoji { + icon: icon{{ "settings/mini_gift_order_number-16x16", lightButtonFg }}; + padding: margins(0px, 2px, 4px, 0px); +} +giftBoxResaleMiniPrice: IconEmoji { + icon: icon{{ "settings/mini_gift_order_price-16x16", lightButtonFg }}; + padding: margins(0px, 2px, 4px, 0px); +} +giftBoxResaleMiniDate: IconEmoji { + icon: icon{{ "settings/mini_gift_order_date-16x16", lightButtonFg }}; + padding: margins(0px, 2px, 4px, 0px); +} giftBoxResaleFilter: PopupMenu(popupMenuWithIcons) { menu: Menu(menuWithIcons) { itemPadding: margins(54px, 8px, 48px, 8px);