Revert changing the constructor and implement new method.

This commit is contained in:
daxpedda 2020-02-14 21:41:35 +01:00
parent 60b40fdc99
commit f4b8bce837
No known key found for this signature in database
GPG key ID: 43D62A3EA388E46F
16 changed files with 39 additions and 44 deletions

View file

@ -7,7 +7,7 @@
use crate::{
input::{mouse, ButtonState},
layout, Clipboard, Element, Event, Hasher, Layout, Length, Point,
Rectangle, Size, Widget,
Rectangle, Widget,
};
use std::hash::Hash;
@ -168,13 +168,11 @@ where
.pad(padding);
let mut content = self.content.layout(renderer, &limits);
content.bounds.x = padding;
content.bounds.y = padding;
content.move_to(Point::new(padding, padding));
let size = limits.resolve(content.size()).pad(padding);
layout::Node::with_children(size, Size::ZERO, vec![content])
layout::Node::with_children(size, vec![content])
}
fn on_event(

View file

@ -2,7 +2,7 @@
use std::hash::Hash;
use crate::{
layout, Align, Clipboard, Size, Element, Event, Hasher, Layout, Length, Point,
layout, Align, Clipboard, Element, Event, Hasher, Layout, Length, Point,
Rectangle, Widget,
};
@ -148,7 +148,7 @@ where
content.align(self.horizontal_alignment, self.vertical_alignment, size);
layout::Node::with_children(size, Size::ZERO, vec![content])
layout::Node::with_children(size, vec![content])
}
fn on_event(

View file

@ -88,7 +88,7 @@ where
size.height = height as f32 * size.width / width as f32;
}
layout::Node::new(size, Size::ZERO)
layout::Node::new(size)
}
fn draw(

View file

@ -95,7 +95,7 @@ where
let size = limits.resolve(Size::ZERO);
layout::Node::new(size, Size::ZERO)
layout::Node::new(size)
}
fn draw(

View file

@ -143,7 +143,7 @@ where
let content = self.content.layout(renderer, &child_limits);
let size = limits.resolve(content.size());
layout::Node::with_children(size, Size::ZERO, vec![content])
layout::Node::with_children(size, vec![content])
}
fn on_event(

View file

@ -135,7 +135,7 @@ where
let size = limits.resolve(Size::ZERO);
layout::Node::new(size, Size::ZERO)
layout::Node::new(size)
}
fn on_event(

View file

@ -62,7 +62,7 @@ where
) -> layout::Node {
let limits = limits.width(self.width).height(self.height);
layout::Node::new(limits.resolve(Size::ZERO), Size::ZERO)
layout::Node::new(limits.resolve(Size::ZERO))
}
fn draw(

View file

@ -85,7 +85,7 @@ where
size.height = height as f32 * size.width / width as f32;
}
layout::Node::new(size, Size::ZERO)
layout::Node::new(size)
}
fn draw(

View file

@ -140,7 +140,7 @@ where
let size = limits.resolve(Size::new(width, height));
layout::Node::new(size, Size::ZERO)
layout::Node::new(size)
}
fn draw(

View file

@ -183,16 +183,10 @@ where
.max_width(self.max_width)
.height(Length::Units(text_size));
let mut text =
layout::Node::new(limits.resolve(Size::ZERO), Size::ZERO);
text.bounds.x = padding;
text.bounds.y = padding;
let mut text = layout::Node::new(limits.resolve(Size::ZERO));
text.move_to(Point::new(padding, padding));
layout::Node::with_children(
text.size().pad(padding),
Size::ZERO,
vec![text],
)
layout::Node::with_children(text.size().pad(padding), vec![text])
}
fn on_event(