Skip to content

Add animated gradients and improve Windows desktop UI #2154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
richiemcilroy merged 3 commits into from
Aug 27, 2026
Merged

Add animated gradients and improve Windows desktop UI #2154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e0f936
feat: add animated gradient backgrounds
richiemcilroy Aug 27, 2026
be4bfb2
fix: improve Windows GPUI desktop integration
richiemcilroy Aug 27, 2026
c6365f9
fix: keep gradient stop drags in one undo step
richiemcilroy Aug 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
572 changes: 563 additions & 9 deletions apps/desktop-gpui/Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions apps/desktop-gpui/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@ dirs = "6"
# downloaded by either app loads identically in both.
whisper-rs = "0.11.0"

[build-dependencies]
tauri-winres = "0.3.5"

[dev-dependencies]
# The editor smoke (`tests/editor_frame0.rs`) drives `EditorInstance`, whose
# decoders, renderer and preview tasks are all tokio-spawned -- a current-thread
Expand All @@ -167,6 +170,7 @@ libc = "0.2"

[target.'cfg(windows)'.dependencies]
raw-window-handle = "0.6"
tray-icon = { version = "0.21.1", default-features = false }
windows-sys = { version = "0.59", features = [
"Win32_Foundation",
"Win32_Security",
Expand Down
15 changes: 15 additions & 0 deletions apps/desktop-gpui/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
fn main() {
if std::env::var("CARGO_CFG_TARGET_OS").as_deref() != Ok("windows") {
return;
}

let icon = "../desktop/src-tauri/icons/icon.ico";
println!("cargo:rerun-if-changed={icon}");
tauri_winres::WindowsResource::new()
.set_icon_with_id(icon, "1")
.set("ProductName", "Cap")
.set("FileDescription", "Cap")
.set("OriginalFilename", "cap-gpui.exe")
.compile()
.expect("failed to compile the Cap Windows icon resource");
}
153 changes: 135 additions & 18 deletions apps/desktop-gpui/patches/zed-windows.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,25 +85,50 @@
+ color.a *= sprite.opacity * saturate(0.5 - distance) * edge_fade_alpha(input.position.xy, sprite.fade);
--- a/crates/gpui_windows/src/window.rs
+++ b/crates/gpui_windows/src/window.rs
@@ -216 +216,5 @@
@@ -95,0 +96 @@
+ pub(crate) custom_frame: bool,
@@ -216 +217,5 @@
- placement.rcNormalPosition,
+ translate_rect(
+ placement.rcNormalPosition,
+ workspace_offset(self.hwnd, self.display.get(), self.scale_factor.get()),
+ 1,
+ ),
@@ -463 +467 @@
@@ -265,0 +271 @@
+ custom_frame: context.custom_frame,
@@ -388,0 +395 @@
+ custom_frame: bool,
@@ -405,0 +413,4 @@
+}
+
+fn custom_frame_enabled(normal_window: bool, transparent_titlebar: Option<bool>) -> bool {
+ normal_window && transparent_titlebar == Some(true)
@@ -452,0 +464,7 @@
+ let custom_frame = custom_frame_enabled(
+ params.kind == WindowKind::Normal,
+ params
+ .titlebar
+ .as_ref()
+ .map(|titlebar| titlebar.appears_transparent),
+ );
@@ -463 +481 @@
- (WS_EX_TOOLWINDOW, WINDOW_STYLE(0x0))
+ (WS_EX_TOOLWINDOW, WS_POPUP)
@@ -465,0 +470,5 @@
+ if hide_title_bar {
@@ -465,0 +484,5 @@
+ if hide_title_bar && !custom_frame {
+ dwstyle |= WS_POPUP;
+ } else {
+ dwstyle |= WS_CAPTION;
+ }
@@ -550,0 +560 @@
@@ -482,0 +506,3 @@
+ if custom_frame {
+ dwexstyle |= WS_EX_WINDOWEDGE;
+ }
@@ -499,0 +526 @@
+ custom_frame,
@@ -550,0 +578 @@
+ params.window_min_size,
@@ -621,2 +631,30 @@
@@ -621,2 +649,30 @@
- let bounds = gpui::bounds(self.bounds().origin, size).to_device_pixels(self.scale_factor());
- let rect = calculate_window_rect(bounds, &self.state.border_offset);
+ let size = size.to_device_pixels(self.scale_factor());
Expand Down Expand Up @@ -136,15 +161,15 @@
+ if !movable {
+ flags |= SWP_NOMOVE;
+ }
@@ -631,2 +669,2 @@
@@ -631,2 +687,2 @@
- bounds.origin.x.0,
- bounds.origin.y.0,
+ rect.left,
+ rect.top,
@@ -635 +673 @@
@@ -635 +691 @@
- SWP_NOMOVE,
+ flags,
@@ -637,0 +676,29 @@
@@ -637,0 +694,29 @@
+ .log_err();
+ }
+ })
Expand Down Expand Up @@ -174,9 +199,9 @@
+ LPARAM(position as isize),
+ )
+ .context("unable to start window move")
@@ -1510,0 +1578 @@
@@ -1510,0 +1596 @@
+ minimum_size: Option<Size<Pixels>>,
@@ -1524 +1592,10 @@
@@ -1524 +1610,10 @@
- placement.rcNormalPosition = calculate_window_rect(bounds, border_offset);
+ let mut rect = calculate_window_rect(bounds, border_offset);
+ if !is_tool_window(hwnd) {
Expand All @@ -188,7 +213,7 @@
+ }
+ placement.rcNormalPosition =
+ translate_rect(rect, workspace_offset(hwnd, display, scale_factor), -1);
@@ -1525,0 +1603,54 @@
@@ -1525,0 +1621,54 @@
+}
+
+fn is_tool_window(hwnd: HWND) -> bool {
Expand Down Expand Up @@ -243,15 +268,29 @@
+ right: left + width,
+ bottom: top + height,
+ }
@@ -1612,2 +1743,2 @@
@@ -1612,2 +1761,2 @@
- use super::ClickState;
- use gpui::{DevicePixels, MouseButton, point};
+ use super::{ClickState, fit_window_rect, translate_rect};
+ use super::{ClickState, custom_frame_enabled, fit_window_rect, translate_rect};
+ use gpui::{Bounds, DevicePixels, MouseButton, point, size};
@@ -1614,0 +1746,66 @@
@@ -1614,0 +1764,80 @@
+ use windows::Win32::Foundation::RECT;
+
+ #[test]
+ fn custom_frame_requires_a_normal_window_with_an_explicit_transparent_titlebar() {
+ assert!(custom_frame_enabled(true, Some(true)));
+ for (normal_window, transparent_titlebar) in [
+ (true, Some(false)),
+ (true, None),
+ (false, Some(true)),
+ (false, Some(false)),
+ (false, None),
+ ] {
+ assert!(!custom_frame_enabled(normal_window, transparent_titlebar));
+ }
+ }
+
+ #[test]
+ fn expanded_window_moves_above_bottom_taskbar() {
+ let work = Bounds {
+ origin: point(DevicePixels(0), DevicePixels(0)),
Expand Down Expand Up @@ -317,17 +356,30 @@
+ }
--- a/crates/gpui_windows/src/events.rs
+++ b/crates/gpui_windows/src/events.rs
@@ -847,5 +846,0 @@
@@ -716,0 +717,12 @@
+ if self.custom_frame && !self.state.is_maximized() {
+ let dpi = unsafe { GetDpiForWindow(handle) };
+ let (frame, top) =
+ custom_frame_insets(get_frame_thicknessx(dpi), dpi, windows_build_number());
+ let params = unsafe { &mut *(lparam.0 as *mut NCCALCSIZE_PARAMS) };
+ params.rgrc[0].left += frame;
+ params.rgrc[0].top += top;
+ params.rgrc[0].right -= frame;
+ params.rgrc[0].bottom -= frame;
+ return Some(0);
+ }
+
@@ -847,5 +858,0 @@
-
- // SetWindowPos may not send WM_SIZE for maximized windows in some cases,
- // so we manually update the size to ensure proper rendering
- let device_size = size(DevicePixels(width), DevicePixels(height));
- self.handle_size_change(device_size, new_scale_factor, true);
@@ -858,3 +852,0 @@
@@ -858,3 +864,0 @@
- // this will emit `WM_SIZE` and `WM_MOVE` right here
- // even before this function returns
- // the new size is handled in `WM_SIZE`
@@ -873,0 +866,15 @@
@@ -873,0 +878,15 @@
+ }
+
+ // SetWindowPos can omit a final WM_SIZE; its outer bounds also include native captions.
Expand All @@ -343,3 +395,68 @@
+ DevicePixels((client_rect.bottom - client_rect.top).max(1)),
+ );
+ self.handle_size_change(device_size, self.state.scale_factor.get(), true);
@@ -1652,0 +1672,26 @@
+fn custom_frame_insets(frame: i32, dpi: u32, windows_build: u32) -> (i32, i32) {
+ let top = if windows_build >= 22000 {
+ (dpi as f32 / 96.).round() as i32
+ } else {
+ 0
+ };
+ (frame, top)
+}
+
+fn windows_build_number() -> u32 {
+ use windows::Win32::System::SystemInformation::OSVERSIONINFOW;
+
+ static BUILD: std::sync::OnceLock<u32> = std::sync::OnceLock::new();
+ *BUILD.get_or_init(|| {
+ let mut version = OSVERSIONINFOW {
+ dwOSVersionInfoSize: std::mem::size_of::<OSVERSIONINFOW>() as u32,
+ ..Default::default()
+ };
+ if unsafe { windows::Wdk::System::SystemServices::RtlGetVersion(&mut version) }.is_ok() {
+ version.dwBuildNumber
+ } else {
+ 0
+ }
+ })
+}
+
@@ -1690,0 +1736,37 @@
+
+#[cfg(test)]
+mod tests {
+ use super::custom_frame_insets;
+
+ #[test]
+ fn windows_10_has_no_top_inset_at_any_scale() {
+ for build in [19045, 21999] {
+ for (frame, dpi) in [(8, 96), (10, 120), (12, 144), (16, 192), (24, 288)] {
+ assert_eq!(custom_frame_insets(frame, dpi, build), (frame, 0));
+ }
+ }
+ }
+
+ #[test]
+ fn windows_11_preserves_the_first_client_row_at_each_scale() {
+ for build in [22000, 22621, 26100] {
+ for (frame, dpi, top) in [
+ (8, 96, 1),
+ (10, 120, 1),
+ (12, 144, 2),
+ (14, 168, 2),
+ (16, 192, 2),
+ (20, 240, 3),
+ (24, 288, 3),
+ ] {
+ assert_eq!(custom_frame_insets(frame, dpi, build), (frame, top));
+ }
+ }
+ }
+
+ #[test]
+ fn unknown_windows_build_does_not_restore_a_native_titlebar() {
+ assert_eq!(custom_frame_insets(8, 96, 0), (8, 0));
+ assert_eq!(custom_frame_insets(16, 192, 0), (16, 0));
+ }
+}
12 changes: 6 additions & 6 deletions apps/desktop-gpui/src/app_windows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ pub fn open_settings(page: Page, cx: &mut App) {
// hand-draws its own.)
titlebar: Some(gpui::TitlebarOptions {
title: Some("Cap Settings".into()),
appears_transparent: !cfg!(target_os = "windows"),
appears_transparent: true,
traffic_light_position: Some(settings_window::TRAFFIC_LIGHTS),
}),
// A normal window, not a panel: the Tauri Settings window is an
Expand Down Expand Up @@ -758,7 +758,7 @@ pub fn open_onboarding(cx: &mut App) {
window_bounds: Some(WindowBounds::Windowed(bounds)),
titlebar: Some(gpui::TitlebarOptions {
title: Some("Welcome to Cap".into()),
appears_transparent: !cfg!(target_os = "windows"),
appears_transparent: true,
traffic_light_position: Some(onboarding_window::TRAFFIC_LIGHTS),
}),
kind: WindowKind::Normal,
Expand Down Expand Up @@ -892,7 +892,7 @@ pub fn open_mode_select(cx: &mut App) -> bool {
// `TitleBarStyle::Overlay`).
titlebar: Some(gpui::TitlebarOptions {
title: Some("Cap Mode Selection".into()),
appears_transparent: !cfg!(target_os = "windows"),
appears_transparent: true,
traffic_light_position: mode_select_window::TRAFFIC_LIGHTS,
}),
// An ordinary window that activates the dock icon
Expand Down Expand Up @@ -1007,7 +1007,7 @@ pub fn open_teleprompter(cx: &mut App) {
// buttons, moved, as on the settings window.
titlebar: Some(gpui::TitlebarOptions {
title: Some("Cap Teleprompter".into()),
appears_transparent: !cfg!(target_os = "windows"),
appears_transparent: true,
traffic_light_position: Some(teleprompter_window::TRAFFIC_LIGHTS),
}),
// `alwaysOnTop: true` + `visibleOnAllWorkspaces: true` are applied
Expand Down Expand Up @@ -2457,7 +2457,7 @@ pub fn open_editor(project_path: PathBuf, cx: &mut App) {
// left group reserves an `h-full w-16` spacer for them.
titlebar: Some(gpui::TitlebarOptions {
title: Some("Cap Editor".into()),
appears_transparent: !cfg!(target_os = "windows"),
appears_transparent: true,
traffic_light_position: editor_window::TRAFFIC_LIGHTS,
}),
// An ordinary window that activates the dock icon
Expand Down Expand Up @@ -3642,7 +3642,7 @@ pub fn open_screenshot_editor(path: PathBuf, cx: &mut App) {
window_bounds: Some(WindowBounds::Windowed(bounds)),
titlebar: Some(gpui::TitlebarOptions {
title: Some("Cap Screenshot Editor".into()),
appears_transparent: !cfg!(target_os = "windows"),
appears_transparent: true,
traffic_light_position: None,
}),
kind: WindowKind::Normal,
Expand Down
Loading
Loading