summaryrefslogtreecommitdiffstats
path: root/native/src/widget
diff options
context:
space:
mode:
authorLibravatar daxpedda <daxpedda@gmail.com>2020-02-14 21:41:35 +0100
committerLibravatar daxpedda <daxpedda@gmail.com>2020-02-14 21:41:35 +0100
commitf4b8bce837513cdd06df3a3ceba86fd9256d3cc5 (patch)
tree5770a36750aac47a7bc656d809f6e217177c6a49 /native/src/widget
parent60b40fdc99647d77febaae1d483fc5642c4ba50d (diff)
downloadiced-f4b8bce837513cdd06df3a3ceba86fd9256d3cc5.tar.gz
iced-f4b8bce837513cdd06df3a3ceba86fd9256d3cc5.tar.bz2
iced-f4b8bce837513cdd06df3a3ceba86fd9256d3cc5.zip
Revert changing the constructor and implement new method.
Diffstat (limited to 'native/src/widget')
-rw-r--r--native/src/widget/button.rs8
-rw-r--r--native/src/widget/container.rs4
-rw-r--r--native/src/widget/image.rs2
-rw-r--r--native/src/widget/progress_bar.rs2
-rw-r--r--native/src/widget/scrollable.rs2
-rw-r--r--native/src/widget/slider.rs2
-rw-r--r--native/src/widget/space.rs2
-rw-r--r--native/src/widget/svg.rs2
-rw-r--r--native/src/widget/text.rs2
-rw-r--r--native/src/widget/text_input.rs14
10 files changed, 16 insertions, 24 deletions
diff --git a/native/src/widget/button.rs b/native/src/widget/button.rs
index 73be4d49..f1d46936 100644
--- a/native/src/widget/button.rs
+++ b/native/src/widget/button.rs
@@ -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(
diff --git a/native/src/widget/container.rs b/native/src/widget/container.rs
index d2065234..07bb62c6 100644
--- a/native/src/widget/container.rs
+++ b/native/src/widget/container.rs
@@ -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(
diff --git a/native/src/widget/image.rs b/native/src/widget/image.rs
index 6938f5d5..200401f9 100644
--- a/native/src/widget/image.rs
+++ b/native/src/widget/image.rs
@@ -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(
diff --git a/native/src/widget/progress_bar.rs b/native/src/widget/progress_bar.rs
index d011cc8a..67d1ab83 100644
--- a/native/src/widget/progress_bar.rs
+++ b/native/src/widget/progress_bar.rs
@@ -95,7 +95,7 @@ where
let size = limits.resolve(Size::ZERO);
- layout::Node::new(size, Size::ZERO)
+ layout::Node::new(size)
}
fn draw(
diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index 6408a3d2..e83f25af 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -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(
diff --git a/native/src/widget/slider.rs b/native/src/widget/slider.rs
index c554fb9e..008203fe 100644
--- a/native/src/widget/slider.rs
+++ b/native/src/widget/slider.rs
@@ -135,7 +135,7 @@ where
let size = limits.resolve(Size::ZERO);
- layout::Node::new(size, Size::ZERO)
+ layout::Node::new(size)
}
fn on_event(
diff --git a/native/src/widget/space.rs b/native/src/widget/space.rs
index 899c258e..24c94bf6 100644
--- a/native/src/widget/space.rs
+++ b/native/src/widget/space.rs
@@ -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(
diff --git a/native/src/widget/svg.rs b/native/src/widget/svg.rs
index 60d403ef..063730bb 100644
--- a/native/src/widget/svg.rs
+++ b/native/src/widget/svg.rs
@@ -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(
diff --git a/native/src/widget/text.rs b/native/src/widget/text.rs
index ef8a9dbc..e4490fb6 100644
--- a/native/src/widget/text.rs
+++ b/native/src/widget/text.rs
@@ -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(
diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index 42aa3d69..c068b895 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -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;
-
- layout::Node::with_children(
- text.size().pad(padding),
- Size::ZERO,
- vec![text],
- )
+ 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), vec![text])
}
fn on_event(