From be93d5b0e05d8e20c7579963c588d82ab4ea5340 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Tue, 5 May 2020 02:33:27 +0200 Subject: [PATCH] Made Region::clip_rect private --- emigui/src/containers/collapsing_header.rs | 4 +++- emigui/src/example_app.rs | 2 +- emigui/src/region.rs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/emigui/src/containers/collapsing_header.rs b/emigui/src/containers/collapsing_header.rs index 3642cbe3..1f335cd2 100644 --- a/emigui/src/containers/collapsing_header.rs +++ b/emigui/src/containers/collapsing_header.rs @@ -113,7 +113,9 @@ impl CollapsingHeader { ) }; - region.clip_rect.max.y = region.clip_rect.max.y.min(region.cursor().y + max_height); + let mut clip_rect = region.clip_rect(); + clip_rect.max.y = clip_rect.max.y.min(region.cursor().y + max_height); + region.set_clip_rect(clip_rect); add_contents(region); diff --git a/emigui/src/example_app.rs b/emigui/src/example_app.rs index 513a04a1..15d1e15c 100644 --- a/emigui/src/example_app.rs +++ b/emigui/src/example_app.rs @@ -216,7 +216,7 @@ impl Painting { region.add_custom_contents(vec2(f32::INFINITY, 200.0), |region| { let canvas_corner = region.cursor(); let interact = region.reserve_space(region.available_space(), Some(region.id())); - region.clip_rect = region.clip_rect.intersect(&interact.rect); // Make sure we don't paint out of bounds + region.set_clip_rect(region.clip_rect().intersect(&interact.rect)); // Make sure we don't paint out of bounds if self.lines.is_empty() { self.lines.push(vec![]); diff --git a/emigui/src/region.rs b/emigui/src/region.rs index ef65aa88..9b8f952b 100644 --- a/emigui/src/region.rs +++ b/emigui/src/region.rs @@ -22,7 +22,7 @@ pub struct Region { /// Everything painte in this rect will be clipped against this. /// This means nothing outside of this rectangle will be visible on screen. - pub(crate) clip_rect: Rect, + clip_rect: Rect, /// The `rect` represents where in space the region is /// and its max size (original available_space).