Use on_after_layout to cap the rendered sidebar item's width

This commit is contained in:
Antonio Scandurra 2021-09-03 17:19:57 +02:00
parent 1b8ea08377
commit 0ae70b62cb
2 changed files with 13 additions and 12 deletions

View file

@ -7,22 +7,22 @@ use crate::{
pub struct Hooks {
child: ElementBox,
before_layout: Option<Box<dyn FnMut(SizeConstraint, &mut LayoutContext)>>,
after_layout: Option<Box<dyn FnMut(Vector2F, &mut LayoutContext)>>,
}
impl Hooks {
pub fn new(child: ElementBox) -> Self {
Self {
child,
before_layout: None,
after_layout: None,
}
}
pub fn on_before_layout(
pub fn on_after_layout(
mut self,
f: impl 'static + FnMut(SizeConstraint, &mut LayoutContext),
f: impl 'static + FnMut(Vector2F, &mut LayoutContext),
) -> Self {
self.before_layout = Some(Box::new(f));
self.after_layout = Some(Box::new(f));
self
}
}
@ -36,10 +36,10 @@ impl Element for Hooks {
constraint: SizeConstraint,
cx: &mut LayoutContext,
) -> (Vector2F, Self::LayoutState) {
if let Some(handler) = self.before_layout.as_mut() {
handler(constraint, cx);
}
let size = self.child.layout(constraint, cx);
if let Some(handler) = self.after_layout.as_mut() {
handler(size, cx);
}
(size, ())
}

View file

@ -113,7 +113,6 @@ impl Sidebar {
container.add_child(self.render_resize_handle(settings, cx));
}
let width = self.width.clone();
container.add_child(
Flexible::new(
1.,
@ -122,9 +121,11 @@ impl Sidebar {
.with_max_width(*self.width.borrow())
.boxed(),
)
.on_before_layout(move |constraint, _| {
let mut width = width.borrow_mut();
*width = width.min(constraint.max.x());
.on_after_layout({
let width = self.width.clone();
move |size, _| {
*width.borrow_mut() = size.x();
}
})
.boxed(),
)