Browse Source

Fix folder unread badges count if dialog muted

Fix poll circles
master
Eduard Kuzmenko 4 years ago
parent
commit
e0b2b1ed39
  1. 7
      src/lib/appManagers/appDialogsManager.ts
  2. 24
      src/scss/style.scss

7
src/lib/appManagers/appDialogsManager.ts

@ -550,7 +550,12 @@ export class AppDialogsManager { @@ -550,7 +550,12 @@ export class AppDialogsManager {
let notMutedCount = 0;
folder.forEach(dialog => {
const isMuted = appMessagesManager.isDialogMuted(dialog);
const value = +!!dialog.unread_count || ((filterId !== 0 || !isMuted) && +dialog.pFlags.unread_mark) || 0; // * unread_mark can be undefined
if(isMuted && filterId === 0) {
return;
}
const value = +!!dialog.unread_count || +dialog.pFlags.unread_mark || 0; // * unread_mark can be undefined
if(isMuted) mutedCount += value;
else notMutedCount += value;
});

24
src/scss/style.scss

@ -1122,6 +1122,18 @@ middle-ellipsis-element { @@ -1122,6 +1122,18 @@ middle-ellipsis-element {
}
}
.progress-ring {
position: absolute;
top: 0;
left: 0;
pointer-events: none;
&__circle {
transition: stroke-dashoffset;
stroke-linecap: round;
}
}
.rlottie, .rlottie-vector {
left: 0;
top: 0;
@ -1178,18 +1190,6 @@ middle-ellipsis-element { @@ -1178,18 +1190,6 @@ middle-ellipsis-element {
position: relative;
}
.progress-ring {
position: absolute;
top: 0;
left: 0;
pointer-events: none;
&__circle {
transition: stroke-dashoffset;
stroke-linecap: round;
}
}
.video-time {
padding: 1px 6px 2px 7px;
background-color: rgba(0, 0, 0, .23) !important;

Loading…
Cancel
Save