Merge pull request #2172 from zed-industries/window-title-shenanigans

Julia created 2 years ago

Window title shenanigans

Change summary

crates/gpui/src/platform/mac/window.rs |  6 ++++--
crates/workspace/src/workspace.rs      | 18 +++++++++++++++++-
2 files changed, 21 insertions(+), 3 deletions(-)

Detailed changes

crates/gpui/src/platform/mac/window.rs

@@ -19,7 +19,7 @@ use cocoa::{
     appkit::{
         CGPoint, NSApplication, NSBackingStoreBuffered, NSScreen, NSView, NSViewHeightSizable,
         NSViewWidthSizable, NSWindow, NSWindowButton, NSWindowCollectionBehavior,
-        NSWindowStyleMask,
+        NSWindowStyleMask, NSWindowTitleVisibility,
     },
     base::{id, nil},
     foundation::{NSAutoreleasePool, NSInteger, NSPoint, NSRect, NSSize, NSString, NSUInteger},
@@ -536,6 +536,7 @@ impl Window {
                 .map_or(true, |titlebar| titlebar.appears_transparent)
             {
                 native_window.setTitlebarAppearsTransparent_(YES);
+                native_window.setTitleVisibility_(NSWindowTitleVisibility::NSWindowTitleHidden);
             }
 
             native_view.setAutoresizingMask_(NSViewWidthSizable | NSViewHeightSizable);
@@ -734,7 +735,8 @@ impl platform::Window for Window {
             let app = NSApplication::sharedApplication(nil);
             let window = self.0.borrow().native_window;
             let title = ns_string(title);
-            msg_send![app, changeWindowsItem:window title:title filename:false]
+            let _: () = msg_send![app, changeWindowsItem:window title:title filename:false];
+            let _: () = msg_send![window, setTitle: title];
         }
     }
 

crates/workspace/src/workspace.rs

@@ -491,19 +491,24 @@ impl Workspace {
         cx.subscribe(&project, move |this, _, event, cx| {
             match event {
                 project::Event::RemoteIdChanged(remote_id) => {
+                    this.update_window_title(cx);
                     this.project_remote_id_changed(*remote_id, cx);
                 }
+
                 project::Event::CollaboratorLeft(peer_id) => {
                     this.collaborator_left(*peer_id, cx);
                 }
+
                 project::Event::WorktreeRemoved(_) | project::Event::WorktreeAdded => {
                     this.update_window_title(cx);
                     this.serialize_workspace(cx);
                 }
+
                 project::Event::DisconnectedFromHost => {
                     this.update_window_edited(cx);
                     cx.blur();
                 }
+
                 _ => {}
             }
             cx.notify()
@@ -1841,8 +1846,9 @@ impl Workspace {
     }
 
     fn update_window_title(&mut self, cx: &mut ViewContext<Self>) {
-        let mut title = String::new();
         let project = self.project().read(cx);
+        let mut title = String::new();
+
         if let Some(path) = self.active_item(cx).and_then(|item| item.project_path(cx)) {
             let filename = path
                 .path
@@ -1856,20 +1862,30 @@ impl Workspace {
                             .root_name(),
                     ))
                 });
+
             if let Some(filename) = filename {
                 title.push_str(filename.as_ref());
                 title.push_str(" — ");
             }
         }
+
         for (i, name) in project.worktree_root_names(cx).enumerate() {
             if i > 0 {
                 title.push_str(", ");
             }
             title.push_str(name);
         }
+
         if title.is_empty() {
             title = "empty project".to_string();
         }
+
+        if project.is_remote() {
+            title.push_str(" ↙");
+        } else if project.is_shared() {
+            title.push_str(" ↗");
+        }
+
         cx.set_window_title(&title);
     }