djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix collapsing header animation

Browse source
This commit is contained in:
Emil Ernerfeldt 2020-05-05 03:05:36 +02:00
parent 50d759d1b4
commit 2f9e70febf
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
emigui/src/containers/collapsing_header.rs
View file

@ -4,6 +4,7 @@ use crate::{layout::Direction, *};
#[serde(default)] #[serde(default)]
pub(crate) struct State { pub(crate) struct State {
open: bool, open: bool,
#[serde(skip)] // Times are relative, and we don't want to continue animations anyway #[serde(skip)] // Times are relative, and we don't want to continue animations anyway
toggle_time: f64, toggle_time: f64,
} }
@ -96,7 +97,7 @@ impl CollapsingHeader {
let time_since_toggle = (region.input().time - state.toggle_time) as f32; let time_since_toggle = (region.input().time - state.toggle_time) as f32;
let animate = time_since_toggle < animation_time; let animate = time_since_toggle < animation_time;
if animate { if animate {
region.indent(id, |region| { region.indent(id, |child_region| {
let max_height = if state.open { let max_height = if state.open {
remap( remap(
time_since_toggle, time_since_toggle,
@ -113,17 +114,15 @@ impl CollapsingHeader {
) )
}; };
let mut clip_rect = region.clip_rect(); let mut clip_rect = child_region.clip_rect();
clip_rect.max.y = clip_rect.max.y.min(region.cursor().y + max_height); clip_rect.max.y = clip_rect.max.y.min(child_region.cursor().y + max_height);
region.set_clip_rect(clip_rect); child_region.set_clip_rect(clip_rect);
add_contents(region); let top_left = child_region.top_left();
add_contents(child_region);
region.child_bounds.max.y = region // Pretend children took up less space than they did:
.child_bounds child_region.child_bounds.max.y =
.max child_region.child_bounds.max.y.min(top_left.y + max_height);
.y
.min(region.cursor().y + max_height);
}); });
} else if state.open { } else if state.open {
region.indent(id, add_contents); region.indent(id, add_contents);