Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 21 additions & 7 deletions apps/gpui_native/native/src/element/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -325,18 +325,19 @@ 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
.lock()
.ok()
.and_then(|resources| resources.get(&resource_id).cloned())
{
raster.render()
raster
} else {
let _ = push_event(
&runtime,
Expand All @@ -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);
}
Expand Down
11 changes: 8 additions & 3 deletions apps/gpui_native/native/src/resource.rs
Original file line number Diff line number Diff line change
@@ -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");
Expand Down Expand Up @@ -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,
Expand All @@ -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;
Expand All @@ -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()
}
}

Expand Down
Loading