From 5fdfe1a36b8b51d4735c55f3401e62825a3cb573 Mon Sep 17 00:00:00 2001 From: Jason Stiebs Date: Wed, 14 Oct 2026 17:34:57 -0500 Subject: [PATCH] Respect styled raster image dimensions --- apps/gpui_native/native/src/element/mod.rs | 28 ++++++++++++++++------ apps/gpui_native/native/src/resource.rs | 11 ++++++--- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/apps/gpui_native/native/src/element/mod.rs b/apps/gpui_native/native/src/element/mod.rs index e726b861..21ea341e 100644 --- a/apps/gpui_native/native/src/element/mod.rs +++ b/apps/gpui_native/native/src/element/mod.rs @@ -325,10 +325,11 @@ pub(crate) fn render_image_primitive( ) -> gpui::AnyElement { use gpui::{ div, InteractiveElement, IntoElement, ParentElement, Role, StatefulInteractiveElement, + Styled, }; - let image = match image { - ImageData::Raster(raster) => raster.render(), + let raster = match image { + ImageData::Raster(raster) => raster, ImageData::Ref(resource_id) => { if let Some(raster) = runtime .resources @@ -336,7 +337,7 @@ pub(crate) fn render_image_primitive( .ok() .and_then(|resources| resources.get(&resource_id).cloned()) { - raster.render() + raster } else { let _ = push_event( &runtime, @@ -345,14 +346,27 @@ pub(crate) fn render_image_primitive( id: resource_id, }, ); - render_missing_resource_placeholder() + let mut element = apply_generated_render_styles(div(), style) + .child(render_missing_resource_placeholder()) + .id(element_id); + if let Some(label) = label { + element = element.role(Role::Image).aria_label(label); + } + return element.into_any_element(); } } }; - let mut element = apply_generated_render_styles(div(), style) - .child(image) - .id(element_id); + // The drawable must follow the styled box instead of independently laying + // out at its raster pixel dimensions (for example, a 2x icon atlas). + let width = raster.width; + let height = raster.height; + let mut element = apply_generated_render_styles( + div().w(gpui::px(width as f32)).h(gpui::px(height as f32)), + style, + ) + .child(raster.render()) + .id(element_id); if let Some(label) = label { element = element.role(Role::Image).aria_label(label); } diff --git a/apps/gpui_native/native/src/resource.rs b/apps/gpui_native/native/src/resource.rs index 8ba5802f..d1925d40 100644 --- a/apps/gpui_native/native/src/resource.rs +++ b/apps/gpui_native/native/src/resource.rs @@ -1,5 +1,8 @@ -use crate::{atoms, gpui}; +use crate::atoms; +#[cfg(feature = "real-gpui")] +use crate::gpui; use rustler::{Binary, NifResult, Term}; +#[cfg(feature = "real-gpui")] use std::sync::Arc; include!("generated/resources.rs"); @@ -30,6 +33,7 @@ fn resource_ref_error(error: gpui_core::resource::ResourceRefError) -> rustler:: } impl RasterData { + #[cfg(feature = "real-gpui")] fn core_raster(self) -> gpui_core::raster::Raster { gpui_core::raster::Raster { width: self.width, @@ -52,8 +56,9 @@ impl RasterData { .map_err(raster_error) } + #[cfg(feature = "real-gpui")] pub(crate) fn render(self) -> gpui::AnyElement { - use gpui::{img, IntoElement, RenderImage}; + use gpui::{img, IntoElement, RenderImage, Styled}; use image::{Frame, RgbaImage}; let width = self.width; @@ -63,7 +68,7 @@ impl RasterData { RgbaImage::from_raw(width, height, data).unwrap_or_else(|| RgbaImage::new(1, 1)); let render_image = Arc::new(RenderImage::new(vec![Frame::new(image)])); - img(render_image).into_any_element() + img(render_image).size_full().into_any_element() } }