catching up with main

2023-10-03 12:05:00 +03:00
parent bfe76467b0 cf5d89d13c
commit 166ca2a227
98 changed files with 4732 additions and 3010 deletions
@@ -131,6 +131,7 @@ pub struct Titlebar {
    pub menu: TitlebarMenu,
    pub project_menu_button: Toggleable<Interactive<ContainedText>>,
    pub git_menu_button: Toggleable<Interactive<ContainedText>>,
+    pub project_host: Interactive<ContainedText>,
    pub item_spacing: f32,
    pub face_pile_spacing: f32,
    pub avatar_ribbon: AvatarRibbon,
@@ -1065,13 +1066,12 @@ impl<'de, T: DeserializeOwned> Deserialize<'de> for Interactive<T> {
 }

 impl Editor {
-    pub fn replica_selection_style(&self, replica_id: u16) -> &SelectionStyle {
-        let style_ix = replica_id as usize % (self.guest_selections.len() + 1);
-        if style_ix == 0 {
-            &self.selection
-        } else {
-            &self.guest_selections[style_ix - 1]
+    pub fn selection_style_for_room_participant(&self, participant_index: u32) -> SelectionStyle {
+        if self.guest_selections.is_empty() {
+            return SelectionStyle::default();
        }
+        let style_ix = participant_index as usize % self.guest_selections.len();
+        self.guest_selections[style_ix]
    }
 }