leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iced: actual just delay updates

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-09-12 20:44:23 +02:00
parent 91a82c02b3
commit ac4bf01315
1 changed files with 21 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/utils/iced.rs
View file

@ -137,7 +137,7 @@ struct IcedElementInternal<P: Program + Send + 'static> {
// draw buffer // draw buffer
outputs: HashSet<Output>, outputs: HashSet<Output>,
buffers: HashMap<OrderedFloat<f64>, (MemoryRenderBuffer, Option<(Vec<Primitive>, Color)>)>, buffers: HashMap<OrderedFloat<f64>, (MemoryRenderBuffer, Option<(Vec<Primitive>, Color)>)>,
pending_resize: Option<(Instant, Size<i32, Logical>)>, pending_update: Option<Instant>,
// state // state
size: Size<i32, Logical>, size: Size<i32, Logical>,
@ -184,7 +184,7 @@ impl<P: Program + Send + Clone + 'static> Clone for IcedElementInternal<P> {
IcedElementInternal { IcedElementInternal {
outputs: self.outputs.clone(), outputs: self.outputs.clone(),
buffers: self.buffers.clone(), buffers: self.buffers.clone(),
pending_resize: self.pending_resize.clone(), pending_update: self.pending_update.clone(),
size: self.size.clone(), size: self.size.clone(),
cursor_pos: self.cursor_pos.clone(), cursor_pos: self.cursor_pos.clone(),
theme: self.theme.clone(), theme: self.theme.clone(),
@ -204,7 +204,7 @@ impl<P: Program + Send + 'static> fmt::Debug for IcedElementInternal<P> {
f.debug_struct("IcedElementInternal") f.debug_struct("IcedElementInternal")
.field("buffers", &"...") .field("buffers", &"...")
.field("size", &self.size) .field("size", &self.size)
.field("pending_resize", &self.pending_resize) .field("pending_update", &self.pending_update)
.field("cursor_pos", &self.cursor_pos) .field("cursor_pos", &self.cursor_pos)
.field("theme", &self.theme) .field("theme", &self.theme)
.field("renderer", &"...") .field("renderer", &"...")
@ -254,7 +254,7 @@ impl<P: Program + Send + 'static> IcedElement<P> {
let mut internal = IcedElementInternal { let mut internal = IcedElementInternal {
outputs: HashSet::new(), outputs: HashSet::new(),
buffers: HashMap::new(), buffers: HashMap::new(),
pending_resize: None, pending_update: None,
size, size,
cursor_pos: None, cursor_pos: None,
theme: Theme::dark(), // TODO theme: Theme::dark(), // TODO
@ -287,8 +287,20 @@ impl<P: Program + Send + 'static> IcedElement<P> {
return; return;
} }
if internal_ref.pending_resize.is_none() { internal_ref.size = size;
internal_ref.pending_resize = Some((Instant::now(), size)); for (scale, (buffer, old_primitives)) in internal_ref.buffers.iter_mut() {
let buffer_size = internal_ref
.size
.to_f64()
.to_buffer(**scale, Transform::Normal)
.to_i32_round();
*buffer =
MemoryRenderBuffer::new(Fourcc::Argb8888, buffer_size, 1, Transform::Normal, None);
*old_primitives = None;
}
if internal_ref.pending_update.is_none() {
internal_ref.pending_update = Some(Instant::now());
} }
} }
@ -702,34 +714,18 @@ where
alpha: f32, alpha: f32,
) -> Vec<C> { ) -> Vec<C> {
let mut internal = self.0.lock().unwrap(); let mut internal = self.0.lock().unwrap();
// makes partial borrows easier
let internal_ref = &mut *internal; let internal_ref = &mut *internal;
let force = if matches!( let force = if matches!(
internal_ref.pending_resize, internal_ref.pending_update,
Some((instant, _)) if Instant::now().duration_since(instant) > Duration::from_millis(25) Some(instant) if Instant::now().duration_since(instant) > Duration::from_millis(25)
) { ) {
internal_ref.size = internal_ref.pending_resize.take().unwrap().1;
for (scale, (buffer, old_primitives)) in internal_ref.buffers.iter_mut() {
let buffer_size = internal_ref
.size
.to_f64()
.to_buffer(**scale, Transform::Normal)
.to_i32_round();
*buffer = MemoryRenderBuffer::new(
Fourcc::Argb8888,
buffer_size,
1,
Transform::Normal,
None,
);
*old_primitives = None;
}
true true
} else { } else {
false false
}; };
let _ = internal_ref.update(force); let _ = internal_ref.update(force);
// makes partial borrows easier
if let Some((buffer, ref mut old_primitives)) = if let Some((buffer, ref mut old_primitives)) =
internal_ref.buffers.get_mut(&OrderedFloat(scale.x)) internal_ref.buffers.get_mut(&OrderedFloat(scale.x))
{ {