Using recent and unpatched GPUI crate

Author: Guibi1

Cargo.lock

@@ -17,9 +17,6 @@ toml = { version = "0.9.5", features = ["serde"] }
 unicode-segmentation = "1.12.0"
 xflags = "0.3.2"
 
-[patch."https://github.com/zed-industries/zed"]
-gpui = { git = "https://github.com/guibi1/zed.git", branch = "patched" }
-
 [profile.release]
 codegen-units = 1
 lto = "thin"

Cargo.toml

@@ -1,7 +1,7 @@
 pub mod client;
 pub mod server;
 
-const SOCKET_PATH: &str = "/tmp/waystart-dev.sock";
+const SOCKET_PATH: &str = "/tmp/waystart.sock";
 
 const MESSAGE_OPEN: &[u8] = b"open";
 const MESSAGE_CLOSE: &[u8] = b"close";

src/ipc/mod.rs

@@ -66,7 +66,7 @@ impl SocketServer {
         let mut lines = reader.lines();
 
         while let Some(Ok(message)) = lines.next().await {
-            if let Err(e) = match message.as_bytes() {
+            match message.as_bytes() {
                 MESSAGE_OPEN => cx.update(|cx| {
                     let mut window = window.borrow_mut();
                     if window.map(|w| w.is_active(cx).is_none()).unwrap_or(true) {
@@ -100,9 +100,6 @@ impl SocketServer {
                     eprintln!("Received unknown IPC message: {}", message);
                     return;
                 }
-            } {
-                eprintln!("Lost reference to app: {}", e);
-                return;
             }
         }
     }

src/ipc/server.rs

@@ -1,6 +1,7 @@
 use gpui::{
-    App, AppContext, Application, BorrowAppContext, Bounds, Entity, Focusable, TitlebarOptions,
-    WindowBounds, WindowDecorations, WindowHandle, WindowKind, WindowOptions, point, px, size,
+    App, AppContext, Application, BorrowAppContext, Bounds, Entity, Focusable, QuitMode,
+    TitlebarOptions, WindowBounds, WindowDecorations, WindowHandle, WindowKind, WindowOptions,
+    point, px, size,
 };
 
 use crate::config::Config;
@@ -54,7 +55,11 @@ fn main() {
 
     Application::new()
         .with_assets(ui::Assets)
-        .keep_running(daemon)
+        .with_quit_mode(if daemon {
+            QuitMode::Explicit
+        } else {
+            QuitMode::LastWindowClosed
+        })
         .run(move |cx| {
             ui::init(cx);
             cx.set_global(SearchEntries::new());
@@ -111,7 +116,7 @@ pub fn open_window(cx: &mut App, waystart: Entity<Waystart>) -> WindowHandle<Way
             ..Default::default()
         },
         |window, cx| {
-            window.focus(&waystart.focus_handle(cx));
+            window.focus(&waystart.focus_handle(cx), cx);
             waystart
         },
     )

src/main.rs

@@ -341,7 +341,7 @@ impl<M: ManagedView> Element for Dropdown<M> {
                                         if let Some(previous_focus_handle) =
                                             previously_focused.borrow_mut().take()
                                         {
-                                            window.focus(&previous_focus_handle);
+                                            window.focus(&previous_focus_handle, cx);
                                         }
                                         *content_view.borrow_mut() = None;
                                         window.refresh();
@@ -469,15 +469,15 @@ impl<M: ManagedView> Element for Dropdown<M> {
                                         && let Some(previous_focus_handle) =
                                             previously_focused.borrow_mut().take()
                                     {
-                                        window.focus(&previous_focus_handle);
+                                        window.focus(&previous_focus_handle, cx);
                                     }
                                     *content_view.borrow_mut() = None;
                                     window.refresh();
                                 }
                             })
                             .detach();
 
-                        window.focus(&new_content_view.focus_handle(cx));
+                        window.focus(&new_content_view.focus_handle(cx), cx);
                         *content_view.borrow_mut() = Some(new_content_view);
                         window.refresh();
                     }

src/ui/elements/dropdown.rs

@@ -606,8 +606,15 @@ impl Element for TextElement {
             window.paint_quad(selection)
         }
         let line = prepaint.line.take().unwrap();
-        line.paint(bounds.origin, window.line_height(), window, cx)
-            .unwrap();
+        line.paint(
+            bounds.origin,
+            window.line_height(),
+            window.text_style().text_align,
+            None,
+            window,
+            cx,
+        )
+        .unwrap();
 
         if focus_handle.is_focused(window)
             && let Some(cursor) = prepaint.cursor.take()

src/ui/elements/input.rs

@@ -234,7 +234,7 @@ impl Render for Waystart {
                                     .collect()
                             }),
                         )
-                        .track_scroll(self.list_scroll_handle.clone())
+                        .track_scroll(&self.list_scroll_handle)
                         .flex_grow()
                         .pb_2(),
                     ),