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

work

Browse Source
This commit is contained in:
shadow cat
2026-01-12 18:40:27 -05:00
parent a9c76e4326
commit 79813db3ba
35 changed files with 378 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
core/src/ui/draw_state.rs
View File

@@ -1,22 +1,34 @@
use crate::{
ActiveData, Axis, EventsLike, Painter, SizeCtx, Ui, UiRegion, UiVec2, WidgetId,
ActiveData, Axis, EventsLike, Painter, PainterData, SizeCtx, StrongWidget, UiRegion,
UiRenderState, UiVec2, WidgetId, Widgets,
render::MaskIdx,
util::{HashSet, forget_ref},
};
use std::ops::{Deref, DerefMut};
/// state maintained between widgets during painting
pub struct DrawState<'a> {
pub(super) ui: &'a mut Ui,
pub struct Drawer<'a> {
pub(super) widgets: &'a mut Widgets,
pub(super) data: &'a mut PainterData,
pub(super) events: &'a mut dyn EventsLike,
pub(super) render: &'a mut UiRenderState,
root: Option<&'a StrongWidget>,
draw_started: HashSet<WidgetId>,
}
impl<'a> DrawState<'a> {
pub fn new(ui: &'a mut Ui, events: &'a mut dyn EventsLike) -> Self {
impl<'a> Drawer<'a> {
pub fn new(
widgets: &'a mut Widgets,
data: &'a mut PainterData,
render: &'a mut UiRenderState,
events: &'a mut dyn EventsLike,
root: Option<&'a StrongWidget>,
) -> Self {
Self {
ui,
widgets,
data,
events,
render,
root,
draw_started: Default::default(),
}
}
@@ -34,13 +46,17 @@ impl<'a> DrawState<'a> {
self.draw_started.remove(&id);
// check if parent depends on the desired size of this, if so then redraw it first
for axis in [Axis::X, Axis::Y] {
if let Some(&(outer, old)) = self.cache.size.axis_dyn(axis).get(&id)
&& let Some(current) = self.active.get(&id)
if let Some(&(outer, old)) = self.render.cache.size.axis_dyn(axis).get(&id)
&& let Some(current) = self.render.active.get(&id)
&& let Some(pid) = current.parent
{
self.cache.size.axis_dyn(axis).remove(&id);
self.render.cache.size.axis_dyn(axis).remove(&id);
let new = self.size_ctx(id, outer).len_axis(id, axis);
self.cache.size.axis_dyn(axis).insert(id, (outer, new));
self.render
.cache
.size
.axis_dyn(axis)
.insert(id, (outer, new));
if new != old {
self.redraw(pid);
}
@@ -68,27 +84,27 @@ impl<'a> DrawState<'a> {
pub(super) fn size_ctx<'b>(&'b mut self, source: WidgetId, outer: UiVec2) -> SizeCtx<'b> {
SizeCtx {
source,
cache: &mut self.ui.cache,
text: &mut self.ui.text,
textures: &mut self.ui.textures,
widgets: &self.ui.widgets,
cache: &mut self.render.cache,
text: &mut self.data.text,
textures: &mut self.data.textures,
widgets: &self.widgets,
outer,
output_size: self.ui.output_size,
output_size: self.render.output_size,
id: source,
}
}
pub fn redraw_all(&mut self) {
// free all resources & cache
for (_, active) in self.ui.active.drain() {
for (_, active) in self.render.active.drain() {
self.events.undraw(&active);
}
self.ui.cache.clear();
self.render.cache.clear();
self.ui.free(self.events);
self.layers.clear();
self.render.layers.clear();
self.widgets.needs_redraw.clear();
if let Some(id) = &self.ui.root {
if let Some(id) = self.root {
self.draw_inner(0, id.id(), UiRegion::FULL, None, MaskIdx::NONE, None);
}
}
@@ -103,8 +119,8 @@ impl<'a> DrawState<'a> {
old_children: Option<Vec<WidgetId>>,
) {
let mut old_children = old_children.unwrap_or_default();
if let Some(active) = self.ui.active.get_mut(&id)
&& !self.ui.widgets.needs_redraw.contains(&id)
if let Some(active) = self.render.active.get_mut(&id)
&& !self.widgets.needs_redraw.contains(&id)
{
// check to see if we can skip drawing first
if active.region == region {
@@ -124,7 +140,7 @@ impl<'a> DrawState<'a> {
self.draw_started.insert(id);
let mut painter = Painter {
state: self,
drawer: self,
region,
mask,
layer,
@@ -134,12 +150,12 @@ impl<'a> DrawState<'a> {
children: Vec::new(),
};
let mut widget = painter.state.widgets.get_dyn_dynamic(id);
let mut widget = painter.drawer.widgets.get_dyn_dynamic(id);
widget.draw(&mut painter);
drop(widget);
let Painter {
state: _,
drawer: _,
region,
mask,
textures,
@@ -170,13 +186,13 @@ impl<'a> DrawState<'a> {
// update modules
self.events.draw(&active);
self.active.insert(id, active);
self.render.active.insert(id, active);
}
fn mov(&mut self, id: WidgetId, from: UiRegion, to: UiRegion) {
let active = self.ui.active.get_mut(&id).unwrap();
let active = self.render.active.get_mut(&id).unwrap();
for h in &active.primitives {
let region = self.ui.layers[h.layer].region_mut(h);
let region = self.render.layers[h.layer].region_mut(h);
*region = region.outside(&from).within(&to);
}
active.region = active.region.outside(&from).within(&to);
@@ -189,16 +205,16 @@ impl<'a> DrawState<'a> {
/// NOTE: instance textures are cleared and self.textures freed
fn remove(&mut self, id: WidgetId, undraw: bool) -> Option<ActiveData> {
let mut active = self.active.remove(&id);
let mut active = self.render.active.remove(&id);
if let Some(active) = &mut active {
for h in &active.primitives {
let mask = self.layers.free(h);
let mask = self.render.layers.free(h);
if mask != MaskIdx::NONE {
self.masks.remove(mask);
self.data.masks.remove(mask);
}
}
active.textures.clear();
self.textures.free();
self.data.textures.free();
if undraw {
self.events.undraw(active);
}
@@ -207,7 +223,7 @@ impl<'a> DrawState<'a> {
}
fn remove_rec(&mut self, id: WidgetId) -> Option<ActiveData> {
self.cache.remove(id);
self.render.cache.remove(id);
let inst = self.remove(id, true);
if let Some(inst) = &inst {
for c in &inst.children {
@@ -217,16 +233,3 @@ impl<'a> DrawState<'a> {
inst
}
}
impl Deref for DrawState<'_> {
type Target = Ui;
fn deref(&self) -> &Self::Target {
self.ui
}
}
impl DerefMut for DrawState<'_> {
fn deref_mut(&mut self) -> &mut Self::Target {
self.ui
}
}