void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-06 15:13:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed color buttons in userpic emoji builder with different scales.

Browse source
This commit is contained in:
23rd 2023-02-08 18:40:25 +03:00
parent 646bb2ff71
commit 9090b8ce6b
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/SourceFiles/info/userpic/info_userpic_builder.style
View file

@ -18,7 +18,7 @@ userpicBuilderEmojiSubtitle: FlatLabel(defaultFlatLabel) {
textFg: windowSubTextFg; textFg: windowSubTextFg;
} }
userpicBuilderEmojiSubtitlePadding: margins(0px, 9px, 0px, 2px); userpicBuilderEmojiSubtitlePadding: margins(0px, 9px, 0px, 2px);
userpicBuilderEmojiBubblePaletteSize: size(356px, 56px); userpicBuilderEmojiBubblePaletteWidth: 356px;
userpicBuilderEmojiBubblePalettePadding: margins(12px, 8px, 12px, 8px); userpicBuilderEmojiBubblePalettePadding: margins(12px, 8px, 12px, 8px);
userpicBuilderEmojiSelectorLeft: 5px; userpicBuilderEmojiSelectorLeft: 5px;

11
Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
View file

@ -434,8 +434,13 @@ not_null<Ui::VerticalLayout*> CreateUserpicBuilder(
const auto paletteBg = Ui::AddBubbleWrap( const auto paletteBg = Ui::AddBubbleWrap(
container, container,
st::userpicBuilderEmojiBubblePaletteSize); QSize(
const auto palette = Ui::CreateChild<Ui::RpWidget>(paletteBg.get()); st::userpicBuilderEmojiBubblePaletteWidth,
std::abs(Ui::BubbleWrapInnerRect(QRect(0, 0, 0, 0)).height())
+ st::userpicBuilderEmojiAccentColorSize
+ rect::m::sum::v(
st::userpicBuilderEmojiBubblePalettePadding)));
const auto palette = Ui::CreateChild<Ui::VerticalLayout>(paletteBg.get());
{ {
constexpr auto kColorsCount = int(7); constexpr auto kColorsCount = int(7);
const auto checkIsSpecial = [=](int i) { const auto checkIsSpecial = [=](int i) {
@ -522,7 +527,7 @@ not_null<Ui::VerticalLayout*> CreateUserpicBuilder(
const auto selectorBg = Ui::AddBubbleWrap( const auto selectorBg = Ui::AddBubbleWrap(
container, container,
QSize( QSize(
st::userpicBuilderEmojiBubblePaletteSize.width(), st::userpicBuilderEmojiBubblePaletteWidth,
st::userpicBuilderEmojiSelectorMinHeight)); st::userpicBuilderEmojiSelectorMinHeight));
const auto selector = Ui::CreateChild<EmojiSelector>( const auto selector = Ui::CreateChild<EmojiSelector>(
selectorBg.get(), selectorBg.get(),