Skip to content

Commit

Permalink
Cleanup: Rename CachedItemGeometryAndTransform to CachedItemBoundingB…
Browse files Browse the repository at this point in the history
…oxAndTransform
  • Loading branch information
tronical committed Jan 29, 2025
1 parent 5ed1710 commit 3bc1774
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions internal/core/item_rendering.rs
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ pub trait ItemRendererFeatures {
/// children.
#[derive(Clone)]

pub enum CachedItemGeometryAndTransform {
pub enum CachedItemBoundingBoxAndTransform {
/// A regular item with a translation
RegularItem {
/// The item's bounding rect relative to its parent.
Expand All @@ -548,24 +548,24 @@ pub enum CachedItemGeometryAndTransform {
},
}

impl CachedItemGeometryAndTransform {
impl CachedItemBoundingBoxAndTransform {
fn bounding_rect(&self) -> &LogicalRect {
match self {
CachedItemGeometryAndTransform::RegularItem { bounding_rect, .. } => bounding_rect,
CachedItemGeometryAndTransform::ItemWithTransform { bounding_rect, .. } => {
CachedItemBoundingBoxAndTransform::RegularItem { bounding_rect, .. } => bounding_rect,
CachedItemBoundingBoxAndTransform::ItemWithTransform { bounding_rect, .. } => {
bounding_rect
}
CachedItemGeometryAndTransform::ClipItem { geometry } => geometry,
CachedItemBoundingBoxAndTransform::ClipItem { geometry } => geometry,
}
}

fn transform(&self) -> ItemTransform {
match self {
CachedItemGeometryAndTransform::RegularItem { offset, .. } => {
CachedItemBoundingBoxAndTransform::RegularItem { offset, .. } => {
ItemTransform::translation(offset.x as f32, offset.y as f32)
}
CachedItemGeometryAndTransform::ItemWithTransform { transform, .. } => **transform,
CachedItemGeometryAndTransform::ClipItem { geometry } => {
CachedItemBoundingBoxAndTransform::ItemWithTransform { transform, .. } => **transform,
CachedItemBoundingBoxAndTransform::ClipItem { geometry } => {
ItemTransform::translation(geometry.origin.x as f32, geometry.origin.y as f32)
}
}
Expand Down Expand Up @@ -603,7 +603,7 @@ impl CachedItemGeometryAndTransform {
}

/// The cache that needs to be held by the Window for the partial rendering
pub type PartialRenderingCache = RenderingCache<CachedItemGeometryAndTransform>;
pub type PartialRenderingCache = RenderingCache<CachedItemBoundingBoxAndTransform>;

/// A region composed of a few rectangles that need to be redrawn.
#[derive(Default, Clone, Debug)]
Expand Down Expand Up @@ -807,7 +807,7 @@ impl<'a, T: ItemRenderer + ItemRendererFeatures> PartialRenderer<'a, T> {
let old_geom = cached_geom.clone();
drop(borrowed);
let new_geom = crate::properties::evaluate_no_tracking(|| {
CachedItemGeometryAndTransform::new::<T>(
CachedItemBoundingBoxAndTransform::new::<T>(
&item_rc,
&self.window_adapter,
)
Expand Down Expand Up @@ -862,7 +862,7 @@ impl<'a, T: ItemRenderer + ItemRendererFeatures> PartialRenderer<'a, T> {
&cached_geom.transform(),
);

if let CachedItemGeometryAndTransform::ClipItem { geometry } =
if let CachedItemBoundingBoxAndTransform::ClipItem { geometry } =
&cached_geom
{
new_state.clipped = new_state
Expand All @@ -887,15 +887,15 @@ impl<'a, T: ItemRenderer + ItemRendererFeatures> PartialRenderer<'a, T> {
_ => {
drop(borrowed);
let bounding_rect = crate::properties::evaluate_no_tracking(|| {
let geom = CachedItemGeometryAndTransform::new::<T>(
let geom = CachedItemBoundingBoxAndTransform::new::<T>(
&item_rc,
&self.window_adapter,
);

new_state
.adjust_transforms_for_child(&geom.transform(), &geom.transform());

if let CachedItemGeometryAndTransform::ClipItem { geometry } = geom {
if let CachedItemBoundingBoxAndTransform::ClipItem { geometry } = geom {
new_state.clipped = new_state
.clipped
.intersection(
Expand Down Expand Up @@ -948,7 +948,7 @@ impl<'a, T: ItemRenderer + ItemRendererFeatures> PartialRenderer<'a, T> {
fn do_rendering(
cache: &RefCell<PartialRenderingCache>,
rendering_data: &CachedRenderingData,
render_fn: impl FnOnce() -> CachedItemGeometryAndTransform,
render_fn: impl FnOnce() -> CachedItemBoundingBoxAndTransform,
) {
let mut cache = cache.borrow_mut();
if let Some(entry) = rendering_data.get_entry(&mut cache) {
Expand Down Expand Up @@ -976,7 +976,7 @@ macro_rules! forward_rendering_call {
let mut ret = None;
Self::do_rendering(&self.cache, &obj.cached_rendering_data, || {
ret = Some(self.actual_renderer.$fn(obj, item_rc, size));
CachedItemGeometryAndTransform::new::<T>(&item_rc, &self.window_adapter)
CachedItemBoundingBoxAndTransform::new::<T>(&item_rc, &self.window_adapter)
});
ret.unwrap_or_default()
}
Expand All @@ -989,7 +989,7 @@ macro_rules! forward_rendering_call2 {
let mut ret = None;
Self::do_rendering(&self.cache, &cache, || {
ret = Some(self.actual_renderer.$fn(obj, item_rc, size, &cache));
CachedItemGeometryAndTransform::new::<T>(&item_rc, &self.window_adapter)
CachedItemBoundingBoxAndTransform::new::<T>(&item_rc, &self.window_adapter)
});
ret.unwrap_or_default()
}
Expand All @@ -1005,7 +1005,7 @@ impl<'a, T: ItemRenderer + ItemRendererFeatures> ItemRenderer for PartialRendere
let item = item_rc.borrow();
let eval = || {
// registers dependencies on the geometry and clip properties.
CachedItemGeometryAndTransform::new::<T>(item_rc, &window_adapter)
CachedItemBoundingBoxAndTransform::new::<T>(item_rc, &window_adapter)
};

let rendering_data = item.cached_rendering_data_offset();
Expand Down

0 comments on commit 3bc1774

Please sign in to comment.