shadowcat/iris
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX SIZE CACHE

Browse Source
This commit is contained in:
shadow cat
2025-12-17 00:09:20 -05:00
parent ecbb9e56e2
commit 1363f31fcd
9 changed files with 144 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
core/src/ui/size.rs
View File

@@ -1,7 +1,6 @@
use crate::{
Axis, Len, RenderedText, Size, TextAttrs, TextBuffer, TextData, Textures, UiVec2, WidgetHandle,
WidgetId, Widgets,
util::{HashMap, Vec2},
Axis, AxisT, IdLike, Len, RenderedText, Size, TextAttrs, TextBuffer, TextData, Textures,
UiVec2, WidgetAxisFns, WidgetId, Widgets, XAxis, YAxis, ui::cache::Cache, util::Vec2,
};
pub struct SizeCtx<'a, State> {
@@ -9,10 +8,7 @@ pub struct SizeCtx<'a, State> {
pub textures: &'a mut Textures,
pub(super) source: WidgetId,
pub(super) widgets: &'a Widgets<State>,
pub(super) cache_width: &'a mut HashMap<WidgetId, (UiVec2, Len)>,
pub(super) cache_height: &'a mut HashMap<WidgetId, (UiVec2, Len)>,
pub(super) checked_width: &'a mut HashMap<WidgetId, (UiVec2, Len)>,
pub(super) checked_height: &'a mut HashMap<WidgetId, (UiVec2, Len)>,
pub(super) cache: &'a mut Cache,
/// TODO: should this be pub? rn used for sized
pub outer: UiVec2,
pub(super) output_size: Vec2,
@@ -28,65 +24,44 @@ impl<State: 'static> SizeCtx<'_, State> {
&self.source
}
pub(super) fn width_inner(&mut self, id: WidgetId) -> Len {
// first check cache
// TODO: is this needed? broken rn bc does not store children during upper size check,
// so if something actually using check_* hits cache it fails to add them
// if let Some(&(outer, len)) = self.cache_width.get(&id)
// && outer == self.outer
// {
// self.checked_width.insert(id, (self.outer, len));
// return len;
// }
// store self vars that need to be maintained
let self_outer = self.outer;
let self_id = self.id;
// get size of input id
self.id = id;
let len = self.widgets.get_dyn_dynamic(id).desired_width(self);
// restore vars & update cache + checked
self.outer = self_outer;
self.id = self_id;
self.cache_width.insert(id, (self.outer, len));
self.checked_width.insert(id, (self.outer, len));
pub(super) fn len_inner<A: const AxisT>(&mut self, id: WidgetId) -> Len {
if let Some((_, len)) = self.cache.size.axis::<A>().get(&id) {
return *len;
}
let len = self
.widgets
.get_dyn_dynamic(id)
.desired_len::<A>(&mut SizeCtx {
text: self.text,
textures: self.textures,
source: self.source,
widgets: self.widgets,
cache: self.cache,
outer: self.outer,
output_size: self.output_size,
id,
});
self.cache.size.axis::<A>().insert(id, (self.outer, len));
len
}
// TODO: should be refactored to share code w width_inner
pub(super) fn height_inner(&mut self, id: WidgetId) -> Len {
// if let Some(&(outer, len)) = self.cache_height.get(&id)
// && outer == self.outer
// {
// self.checked_height.insert(id, (self.outer, len));
// return len;
// }
let self_outer = self.outer;
let self_id = self.id;
self.id = id;
let len = self.widgets.get_dyn_dynamic(id).desired_height(self);
self.outer = self_outer;
self.id = self_id;
self.cache_height.insert(id, (self.outer, len));
self.checked_height.insert(id, (self.outer, len));
len
pub fn width(&mut self, id: impl IdLike<State>) -> Len {
self.len_inner::<XAxis>(id.id())
}
pub fn width<W: ?Sized>(&mut self, id: &WidgetHandle<State, W>) -> Len {
self.width_inner(id.id())
pub fn height(&mut self, id: impl IdLike<State>) -> Len {
self.len_inner::<YAxis>(id.id())
}
pub fn height<W: ?Sized>(&mut self, id: &WidgetHandle<State, W>) -> Len {
self.height_inner(id.id())
}
pub fn len_axis<W: ?Sized>(&mut self, id: &WidgetHandle<State, W>, axis: Axis) -> Len {
pub fn len_axis(&mut self, id: impl IdLike<State>, axis: Axis) -> Len {
match axis {
Axis::X => self.width(id),
Axis::Y => self.height(id),
}
}
pub fn size<W: ?Sized>(&mut self, id: &WidgetHandle<State, W>) -> Size {
pub fn size(&mut self, id: impl IdLike<State>) -> Size {
let id = id.id();
Size {
x: self.width(id),
y: self.height(id),