Skip to content
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

fix(iced): use internal_ref size #1051

Merged
merged 3 commits into from
Dec 12, 2024
Merged

fix(iced): use internal_ref size #1051

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
282f81b
fix(iced): use internal_ref size
wash2 Dec 12, 2024
2cfa7ff
fix: improve damage tracking
wash2 Dec 12, 2024
6a55618
fix: manually scale the damage
wash2 Dec 12, 2024
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
73 changes: 56 additions & 17 deletions src/utils/iced.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ use cosmic::{
},
Theme,
};
use iced_tiny_skia::{graphics::Viewport, Primitive};
use iced_tiny_skia::{
graphics::{damage, Viewport},
Layer,
};

use once_cell::sync::Lazy;
use ordered_float::OrderedFloat;
Expand Down Expand Up @@ -143,7 +146,7 @@ impl<P: Program> IcedProgram for ProgramWrapper<P> {
pub(crate) struct IcedElementInternal<P: Program + Send + 'static> {
// draw buffer
outputs: HashSet<Output>,
buffers: HashMap<OrderedFloat<f64>, (MemoryRenderBuffer, Option<(Vec<Primitive>, Color)>)>,
buffers: HashMap<OrderedFloat<f64>, (MemoryRenderBuffer, Option<(Vec<Layer>, Color)>)>,
pending_update: Option<Instant>,

// state
Expand Down Expand Up @@ -850,7 +853,9 @@ where
internal_ref.pending_update = None;
}
let _ = internal_ref.update(force);
if let Some((buffer, _)) = internal_ref.buffers.get_mut(&OrderedFloat(scale.x)) {
if let Some((buffer, ref mut old_layers)) =
internal_ref.buffers.get_mut(&OrderedFloat(scale.x))
{
let size: Size<i32, BufferCoords> = internal_ref
.size
.to_f64()
Expand All @@ -870,23 +875,57 @@ where
let background_color = state_ref.program().0.background_color(theme);
let bounds = IcedSize::new(size.w as u32, size.h as u32);
let viewport = Viewport::with_physical_size(bounds, scale.x);

let damage = vec![cosmic::iced::Rectangle::new(
cosmic::iced::Point::default(),
viewport.logical_size(),
)];

internal_ref.renderer.draw(
&mut pixels,
&mut clip_mask,
&viewport,
&damage,
background_color,
&overlay,
let scale_x = scale.x as f32;
let current_layers = internal_ref.renderer.layers();
let mut damage: Vec<_> = old_layers
.as_ref()
.and_then(|(last_primitives, last_color)| {
(last_color == &background_color).then(|| {
damage::diff(
&last_primitives,
current_layers,
|_| {
vec![cosmic::iced::Rectangle::new(
cosmic::iced::Point::default(),
viewport.logical_size(),
)]
},
Layer::damage,
)
.into_iter()
.filter(|d| {
let width = d.width as u32;
let height = d.height as u32;

width > 1 && height > 1
})
.collect()
})
})
.unwrap_or_else(|| {
vec![cosmic::iced::Rectangle::with_size(viewport.logical_size())]
});
damage = damage::group(
damage,
cosmic::iced::Rectangle::with_size(viewport.logical_size()),
);

if !damage.is_empty() {
*old_layers = Some((current_layers.to_vec(), background_color));

internal_ref.renderer.draw(
&mut pixels,
&mut clip_mask,
&viewport,
&damage,
background_color,
&overlay,
);
}

let damage = damage
.into_iter()
.map(|d| d * scale_x)
.filter_map(|x| x.snap())
.map(|damage_rect| {
Rectangle::from_loc_and_size(
Expand Down Expand Up @@ -915,7 +954,7 @@ where
.to_logical(1., Transform::Normal)
.to_i32_round(),
)),
Some(size.to_logical(1, Transform::Normal)),
Some(internal_ref.size),
Kind::Unspecified,
) {
return vec![C::from(buffer)];
Expand Down
Loading