mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-04-16 06:07:06 +02:00
Improve emoji footer over state in status panel.
This commit is contained in:
parent
1aeca7b486
commit
f55d9fb82b
3 changed files with 7 additions and 6 deletions
|
@ -45,6 +45,7 @@ EmojiPan {
|
|||
bg: color;
|
||||
overBg: color;
|
||||
categoriesBg: color;
|
||||
categoriesBgOver: color;
|
||||
fadeLeft: icon;
|
||||
fadeRight: icon;
|
||||
search: TabbedSearch;
|
||||
|
@ -261,6 +262,7 @@ defaultEmojiPan: EmojiPan {
|
|||
bg: emojiPanBg;
|
||||
overBg: emojiPanHover;
|
||||
categoriesBg: emojiPanCategories;
|
||||
categoriesBgOver: windowBgRipple;
|
||||
fadeLeft: icon {{ "fade_horizontal-flip_horizontal", emojiPanCategories }};
|
||||
fadeRight: icon {{ "fade_horizontal", emojiPanCategories }};
|
||||
search: defaultTabbedSearch;
|
||||
|
@ -268,6 +270,7 @@ defaultEmojiPan: EmojiPan {
|
|||
}
|
||||
statusEmojiPan: EmojiPan(defaultEmojiPan) {
|
||||
categoriesBg: windowBg;
|
||||
categoriesBgOver: windowBgOver;
|
||||
fadeLeft: icon {{ "fade_horizontal-flip_horizontal", windowBg }};
|
||||
fadeRight: icon {{ "fade_horizontal", windowBg }};
|
||||
}
|
||||
|
|
|
@ -176,9 +176,7 @@ object_ptr<TabbedSelector::InnerFooter> GifsListWidget::createFooter() {
|
|||
const auto i = ranges::find(_sections, setId, [](GifSection value) {
|
||||
return value.document->id;
|
||||
});
|
||||
if (i != end(_sections)) {
|
||||
searchForGifs(i->emoji->text());
|
||||
}
|
||||
searchForGifs((i != end(_sections)) ? i->emoji->text() : QString());
|
||||
}, _footer->lifetime());
|
||||
|
||||
return result;
|
||||
|
|
|
@ -295,8 +295,8 @@ StickersListFooter::StickersListFooter(Descriptor &&descriptor)
|
|||
, _settingsButtonVisible(descriptor.settingsButtonVisible)
|
||||
, _iconState([=] { update(); })
|
||||
, _subiconState([=] { update(); })
|
||||
, _selectionBg(st::emojiPanRadius, st::windowBgRipple)
|
||||
, _subselectionBg(st().iconArea / 2, st::windowBgRipple) {
|
||||
, _selectionBg(st::emojiPanRadius, st().categoriesBgOver)
|
||||
, _subselectionBg(st().iconArea / 2, st().categoriesBgOver) {
|
||||
setMouseTracking(true);
|
||||
|
||||
_iconsLeft = st().iconSkip
|
||||
|
@ -679,7 +679,7 @@ void StickersListFooter::paintSelectionBg(
|
|||
area / 2,
|
||||
progress);
|
||||
p.setPen(Qt::NoPen);
|
||||
p.setBrush(st::windowBgRipple);
|
||||
p.setBrush(st().categoriesBgOver);
|
||||
p.drawRoundedRect(rect, radius, radius);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue