mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-23 18:32:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Seperate online and offline

Browse source
This commit is contained in:
Mikayla Maki 2023-06-27 13:32:42 -07:00
parent 825a7cb799
commit 19ca6a8875
No known key found for this signature in database
3 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
crates/collab_ui/src/collab_titlebar_item.rs
View file

@ -98,13 +98,7 @@ impl View for CollabTitlebarItem {
let status = &*status.borrow();
if matches!(status, client::Status::Connected { .. }) {
right_container.add_child(self.render_toggle_contacts_button(&theme, cx));
let avatar = ActiveCall::global(cx)
.read(cx)
.room()
.is_none()
.then(|| user.as_ref())
.flatten()
.and_then(|user| user.avatar.clone());
let avatar = user.as_ref().and_then(|user| user.avatar.clone());
right_container.add_child(self.render_user_menu_button(&theme, avatar, cx));
} else {
right_container.add_children(self.render_connection_status(status, cx));
@ -645,13 +639,17 @@ impl CollabTitlebarItem {
cx: &mut ViewContext<Self>,
) -> AnyElement<Self> {
let tooltip = theme.tooltip.clone();
let user_menu_button = &theme.titlebar;
let avatar_style = &user_menu_button.user_menu_button.avatar;
let user_menu_button_style = if avatar.is_some() {
&theme.titlebar.user_menu_button_online
} else {
&theme.titlebar.user_menu_button_offline
};
let avatar_style = &user_menu_button_style.avatar;
Stack::new()
.with_child(
MouseEventHandler::<ToggleUserMenu, Self>::new(0, cx, |state, _| {
let style = user_menu_button
.user_menu_button
let style = user_menu_button_style
.user_menu
.inactive_state()
.style_for(state);
@ -665,12 +663,13 @@ impl CollabTitlebarItem {
Color::transparent_black(),
));
};
dropdown
.with_child(
Svg::new("icons/caret_down_8.svg")
.with_color(theme.titlebar.user_menu_button.icon.color)
.with_color(user_menu_button_style.icon.color)
.constrained()
.with_width(theme.titlebar.user_menu_button.icon.width)
.with_width(user_menu_button_style.icon.width)
.contained()
.into_any(),
)

3
crates/theme/src/theme.rs
View file

@ -144,7 +144,8 @@ pub struct Titlebar {
#[derive(Clone, Deserialize, Default, JsonSchema)]
pub struct UserMenu {
pub user_menu_button: UserMenuButton,
pub user_menu_button_online: UserMenuButton,
pub user_menu_button_offline: UserMenuButton,
}
#[derive(Clone, Deserialize, Default, JsonSchema)]
pub struct UserMenuButton {

8
styles/src/styleTree/titlebar.ts
View file

@ -56,7 +56,7 @@ const titlebarButton = (theme: ColorScheme) => toggleable({
* When logged in shows the user's avatar and a chevron,
* When logged out only shows a chevron.
*/
function userMenuButton(theme: ColorScheme) {
function userMenuButton(theme: ColorScheme, online: boolean) {
return {
user_menu: titlebarButton(theme),
avatar: {
@ -71,13 +71,15 @@ function userMenuButton(theme: ColorScheme) {
icon: {
width: 11,
height: 11,
color: foreground(theme.lowest)
color: online ? foreground(theme.lowest) : background(theme.lowest)
}
}
}
export function titlebar(theme: ColorScheme) {
return {
userMenuButton: userMenuButton(theme)
userMenuButtonOnline: userMenuButton(theme, true),
userMenuButtonOffline: userMenuButton(theme, false)
}
}