Make Iris layout dependencies explicit
This commit is contained in:
1 parent
2bc0ff1866
commit
3ae034a47b
25 files changed
+609
-186
No files matched your search
@@ -30,7 +30,7 @@ impl Widget for ScrollArea {
|
||||
self.tick_fling(now)
|
||||
}
|
||||
|
||||
fn draw(&mut self, painter: &mut Painter) -> Size {
|
||||
fn draw(&mut self, painter: &mut Painter) {
|
||||
let axis = self.ctl.axis();
|
||||
let container_len = painter.px_size().axis(axis);
|
||||
self.container_len = container_len;
|
||||
@@ -41,7 +41,9 @@ impl Widget for ScrollArea {
|
||||
self.ctl.set_amt(travelled);
|
||||
|
||||
let hint = self.content_len.unwrap_or(container_len);
|
||||
let used = painter.widget_within(&self.inner, self.child_region(hint));
|
||||
let used = painter
|
||||
.widget_within(&self.inner, self.child_region(hint))
|
||||
.size();
|
||||
|
||||
let measured = used
|
||||
.axis(axis)
|
||||
@@ -62,7 +64,10 @@ impl Widget for ScrollArea {
|
||||
fwd: range - amt,
|
||||
});
|
||||
|
||||
painter.place(&self.inner, self.child_region(measured))
|
||||
let size = painter
|
||||
.place(&self.inner, self.child_region(measured))
|
||||
.size();
|
||||
painter.set_size(size);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user