Skip to content

[NEW] Unread bars on sidebar (#16853) #16862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggazzo merged 3 commits into from
May 12, 2020
Merged

[NEW] Unread bars on sidebar (#16853) #16862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b7ebdf
[FIX] Unread bottom, top bars on sidebar when there are unread messag…
juzser Mar 12, 2020
7dd2011
Merge branch 'develop' into fix-unread-bars-on-sidebar
juzser Mar 31, 2020
8c0b3f6
Merge branch 'develop' into fix-unread-bars-on-sidebar
ggazzo May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/theme/client/imports/components/sidebar/sidebar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@
}

& .unread-rooms {
display: none;
padding: calc(var(--sidebar-small-default-padding) - 8px);
Copy link
Member

@gabriellsh gabriellsh Mar 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What are those 8 pixels? scrollbar?

Copy link
Contributor Author

@juzser juzser Mar 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, the .sidebar-item has 3px padding top and the total height is 34px (base on var(--sidebar-item-height-medium)).
So I put the default padding there plus 8px to equal the sidebar-item


text-align: center;
}
}

Expand Down
2 changes: 2 additions & 0 deletions app/ui-utils/client/lib/RoomManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import _ from 'underscore';
import { fireGlobalEvent } from './fireGlobalEvent';
import { upsertMessage, RoomHistoryManager } from './RoomHistoryManager';
import { mainReady } from './mainReady';
import { menu } from './menu';
import { roomTypes } from '../../../utils';
import { callbacks } from '../../../callbacks';
import { Notifications } from '../../../notifications';
Expand Down Expand Up @@ -86,6 +87,7 @@ export const RoomManager = new function() {
name,
};
if (isNew) {
menu.updateUnreadBars();
callbacks.run('streamNewMessage', msg);
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/ui-utils/client/lib/menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const menu = new class extends EventEmitter {
const listHeight = this.list.height();
let showTop = false;
let showBottom = false;
$('li.has-alert').each(function() {
$('li.sidebar-item--unread').each(function() {
if ($(this).offset().top < listOffset.top - $(this).height()) {
showTop = true;
}
Expand Down