Update to new gpui with wgpu backend

Cargo.toml

@@ -8,9 +8,9 @@ license = "MIT"
 authors = ["Leonard Seibold <git@zrtx.de>"]
 
 [dependencies]
-gpui = { git = "https://github.com/zed-industries/zed", rev = "7c724c0f1049e610c541c2f4f6a8739f91865e02" }
-gpui-component = "0.5.0"
-gpui-component-assets = "0.5.0"
+gpui = { git = "https://github.com/zed-industries/zed" }
+gpui-component = { git = "https://github.com/longbridge/gpui-component", rev = "11b02b0e7a9fb51639dd9a28f3ad5aa4f99fdd81" }
+gpui-component-assets = { git = "https://github.com/longbridge/gpui-component", rev = "11b02b0e7a9fb51639dd9a28f3ad5aa4f99fdd81" }
 rust-embed = "8"
 anyhow = "1"
 thiserror = "2"
@@ -46,7 +46,7 @@ zbus = { version = "5", default-features = false, features = ["blocking-api"] }
 notify = "8"
 
 [patch.crates-io]
-gpui = { git = "https://github.com/zed-industries/zed", rev = "7c724c0f1049e610c541c2f4f6a8739f91865e02" }
+gpui = { git = "https://github.com/zed-industries/zed" }
 zbus = { git = "https://github.com/dbus2/zbus.git", tag = "zvariant-5.8.0" }
 zbus_macros = { git = "https://github.com/dbus2/zbus.git", tag = "zvariant-5.8.0" }
 zbus_names = { git = "https://github.com/dbus2/zbus.git", tag = "zvariant-5.8.0" }

flake.nix

@@ -24,13 +24,13 @@
           buildInputs = with pkgs; [
             openssl
             libxkbcommon
-            xorg.libxcb
+            libxcb
             wayland
             freetype
             fontconfig
           ];
 
-          cargoHash = "sha256-4MIGbfsXbsCdz3f6axO5AwoeH4oLpWxy4UI8qzYUZpY=";
+          cargoHash = "sha256-jTsq4Ed7REQ+dPgSXud2Frr27VqF99XFRO+v5+PjTeU=";
 
           postFixup = with pkgs; ''
             patchelf --add-rpath ${vulkan-loader}/lib $out/bin/zlaunch
@@ -51,7 +51,7 @@
           buildInputs = with pkgs; [
             openssl
             libxkbcommon
-            xorg.libxcb
+            libxcb
             wayland
             freetype
             fontconfig
@@ -62,7 +62,7 @@
               pkgs.wayland
               pkgs.libxkbcommon
               pkgs.vulkan-loader
-              pkgs.xorg.libxcb
+              pkgs.libxcb
             ];
           };
         };

src/app/window.rs

@@ -74,7 +74,7 @@ fn create_and_show_window_impl(
         size(px(1920.0), px(1080.0))
     } else {
         // For other compositors, 8K and hope for the best
-        size(px(7680.0), px(4320.0))
+        size(px(5680.0), px(4320.0))
     };
 
     let fullscreen_bounds = Bounds {

src/daemon/event_handler.rs

@@ -230,5 +230,4 @@ fn handle_show(
             }
         }
     })
-    .unwrap_or(Err(IpcError::Internal("Failed to update app".into())))
 }

src/ui/core/focus.rs

@@ -1,4 +1,4 @@
-use gpui::{Context, FocusHandle, Focusable, Subscription, Window};
+use gpui::{App, Context, FocusHandle, Focusable, Subscription, Window};
 
 /// Manages focus for a view with automatic blur handling
 pub struct FocusManager {
@@ -37,8 +37,8 @@ impl FocusManager {
     }
 
     /// Request focus for this view
-    pub fn focus(&self, window: &mut Window) {
-        window.focus(&self.focus_handle);
+    pub fn focus(&self, window: &mut Window, cx: &mut App) {
+        window.focus(&self.focus_handle, cx);
     }
 
     /// Check if this view has focus

src/ui/markdown/mod.rs

@@ -33,8 +33,8 @@ pub fn render_markdown(text: &str, window: &mut Window, cx: &mut App) -> impl In
 pub fn render_markdown_with_id(
     id: impl Into<SharedString>,
     text: &str,
-    window: &mut Window,
-    cx: &mut App,
+    _window: &mut Window,
+    _cx: &mut App,
 ) -> impl IntoElement {
     let t = theme();
 
@@ -71,9 +71,7 @@ pub fn render_markdown_with_id(
     let text: SharedString = text.to_string().into();
 
     // Wrap in a container with text_sm for consistent small font size
-    div().text_sm().child(
-        TextView::markdown(id, text, window, cx)
-            .style(style)
-            .selectable(true),
-    )
+    div()
+        .text_sm()
+        .child(TextView::markdown(id, text).style(style).selectable(true))
 }