Rearrange `layout` code to improve readability

3 files changed, 2 insertions, 8 deletions

diff --git a/native/src/widget/button.rs b/native/src/widget/button.rs
index 01b528ec..1582188b 100644
--- a/native/src/widget/button.rs
+++ b/native/src/widget/button.rs
@@ -429,13 +429,11 @@ pub fn layout<Renderer>(
     let limits = limits.width(width).height(height);
 
     let mut content = layout_content(renderer, &limits.pad(padding));
-
     let padding = padding.fit(content.size(), limits.max());
+    let size = limits.pad(padding).resolve(content.size()).pad(padding);
 
     content.move_to(Point::new(padding.left.into(), padding.top.into()));
 
-    let size = limits.pad(padding).resolve(content.size()).pad(padding);
-
     layout::Node::with_children(size, vec![content])
 }
 
diff --git a/native/src/widget/container.rs b/native/src/widget/container.rs
index 1c060375..10a80b58 100644
--- a/native/src/widget/container.rs
+++ b/native/src/widget/container.rs
@@ -296,9 +296,7 @@ pub fn layout<Renderer>(
         .height(height);
 
     let mut content = layout_content(renderer, &limits.pad(padding).loose());
-
     let padding = padding.fit(content.size(), limits.max());
-
     let size = limits.pad(padding).resolve(content.size());
 
     content.move_to(Point::new(padding.left.into(), padding.top.into()));
diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index a71c3b63..dfc49a8d 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -357,13 +357,11 @@ where
     let limits = limits.width(width).height(Length::Shrink);
 
     let mut text = layout::Node::new(text_limits.resolve(Size::ZERO));
-
     let padding = padding.fit(text.size(), limits.max());
+    let size = limits.pad(padding).resolve(text.size()).pad(padding);
 
     text.move_to(Point::new(padding.left.into(), padding.top.into()));
 
-    let size = limits.pad(padding).resolve(text.size()).pad(padding);
-
     layout::Node::with_children(size, vec![text])
 }