diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs index 04457c7233a8f035b83a0c87efb733a50cbb8f6f..b8f319970d192094f4b442408228be2659e72d29 100644 --- a/crates/collab_ui/src/collab_titlebar_item.rs +++ b/crates/collab_ui/src/collab_titlebar_item.rs @@ -644,8 +644,8 @@ impl CollabTitlebarItem { .unwrap_or_default(); if let Some(replica_id) = replica_id { if followed_by_self { - let selection = dbg!(theme.editor.replica_selection_style(replica_id).selection); - background_color = dbg!(Color::blend(selection, background_color)); + let selection = theme.editor.replica_selection_style(replica_id).selection; + background_color = Color::blend(selection, background_color); background_color.a = 255; } } @@ -692,14 +692,18 @@ impl CollabTitlebarItem { .flatten(), ); + let mut container = face_pile + .contained() + .with_style(theme.workspace.titlebar.leader_selection); + if let Some(replica_id) = replica_id { if followed_by_self { let color = theme.editor.replica_selection_style(replica_id).selection; - return face_pile.contained().with_background_color(color).boxed(); + container = container.with_background_color(color); } } - face_pile.boxed() + container.boxed() })) .with_children((|| { let replica_id = replica_id?; diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs index a425ce3b9b34110634b0bf4b44009c8c3ce84228..96391c943ac28c07652ffda9d1350af851cf036f 100644 --- a/crates/theme/src/theme.rs +++ b/crates/theme/src/theme.rs @@ -77,6 +77,7 @@ pub struct Titlebar { pub avatar_margin: f32, pub avatar_ribbon: AvatarRibbon, pub follower_avatar_overlap: f32, + pub leader_selection: ContainerStyle, pub offline_icon: OfflineIcon, pub avatar: AvatarStyle, pub inactive_avatar: AvatarStyle, diff --git a/styles/src/styleTree/workspace.ts b/styles/src/styleTree/workspace.ts index 7f793161253201c7f54551f7c8c731e944db17a6..6770d3bd7ec1c8f3fdf093ad7cf66c08e4c0066d 100644 --- a/styles/src/styleTree/workspace.ts +++ b/styles/src/styleTree/workspace.ts @@ -116,6 +116,19 @@ export default function workspace(colorScheme: ColorScheme) { outerCornerRadius: followerAvatarOuterWidth / 2, }, followerAvatarOverlap: 8, + leaderSelection: { + margin: { + top: 4, + bottom: 4, + }, + padding: { + left: 2, + right: 2, + top: 4, + bottom: 4, + }, + cornerRadius: 6, + }, avatarRibbon: { height: 3, width: 12,