procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed badge update during theme testing.

This commit is contained in:
23rd 2019-09-05 11:54:55 +03:00 committed by John Preston
parent 4951eeac98
commit 639b4bdd27
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Telegram/SourceFiles/platform/mac/mac_touchbar.mm
View File

@ -498,28 +498,19 @@ void AppendEmojiPacks(std::vector<PickerScrubberItem> &to) {
button.action = @selector(buttonActionPin:); button.action = @selector(buttonActionPin:);
self.view = button; self.view = button;
using Update = const Window::Theme::BackgroundUpdate; base::ObservableViewer(
auto themeChanged = base::ObservableViewer(
*Window::Theme::Background() *Window::Theme::Background()
) | rpl::start_spawning(_lifetime); ) | rpl::filter([](const Window::Theme::BackgroundUpdate &update) {
return update.paletteChanged();
rpl::duplicate(
themeChanged
) | rpl::filter([=](const Update &update) {
return update.paletteChanged()
&& (_number <= kSavedMessagesId || UseEmptyUserpic(_peer));
}) | rpl::start_with_next([=] { }) | rpl::start_with_next([=] {
[self updateUserpic]; crl::on_main([=] {
}, _lifetime); if (_number <= kSavedMessagesId || UseEmptyUserpic(_peer)) {
[self updateUserpic];
std::move( } else if (_peer
themeChanged && (UnreadCount(_peer) || Data::IsPeerAnOnlineUser(_peer))) {
) | rpl::filter([=](const Update &update) { [self updateBadge];
return (update.type == Update::Type::ApplyingTheme) }
&& (_peer != nullptr) });
&& (UnreadCount(_peer) || Data::IsPeerAnOnlineUser(_peer));
}) | rpl::start_with_next([=] {
[self updateBadge];
}, _lifetime); }, _lifetime);
if (num <= kSavedMessagesId) { if (num <= kSavedMessagesId) {
@ -613,9 +604,8 @@ void AppendEmojiPacks(std::vector<PickerScrubberItem> &to) {
return; return;
} }
isWaitingUserpicLoad = !self.peer->userpicLoaded(); isWaitingUserpicLoad = !self.peer->userpicLoaded();
auto pixmap = self.peer->genUserpic(kIdealIconSize); _userpic = self.peer->genUserpic(kIdealIconSize);
pixmap.setDevicePixelRatio(cRetinaFactor()); _userpic.setDevicePixelRatio(cRetinaFactor());
_userpic = pixmap;
[self updateBadge]; [self updateBadge];
} }