summaryrefslogtreecommitdiffstats
path: root/native/src/widget/button.rs
diff options
context:
space:
mode:
Diffstat (limited to 'native/src/widget/button.rs')
-rw-r--r--native/src/widget/button.rs16
1 files changed, 10 insertions, 6 deletions
diff --git a/native/src/widget/button.rs b/native/src/widget/button.rs
index 882d4a6c..980c2aae 100644
--- a/native/src/widget/button.rs
+++ b/native/src/widget/button.rs
@@ -7,7 +7,7 @@
//! [`Class`]: enum.Class.html
use crate::input::{mouse, ButtonState};
-use crate::{layout, Element, Event, Hasher, Layout, Point, Widget};
+use crate::{layout, Element, Event, Hasher, Layout, Length, Point, Widget};
use std::hash::Hash;
pub use iced_core::button::State;
@@ -21,14 +21,18 @@ where
Renderer: self::Renderer,
Message: Clone + std::fmt::Debug,
{
- fn layout(&self, renderer: &Renderer, limits: &layout::Limits) -> Layout {
+ fn layout(
+ &self,
+ renderer: &Renderer,
+ limits: &layout::Limits,
+ ) -> layout::Node {
renderer.layout(&self, limits)
}
fn on_event(
&mut self,
event: Event,
- layout: &Layout,
+ layout: Layout<'_>,
cursor_position: Point,
messages: &mut Vec<Message>,
_renderer: &Renderer,
@@ -66,7 +70,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
- layout: &Layout,
+ layout: Layout<'_>,
cursor_position: Point,
) -> Renderer::Output {
renderer.draw(&self, layout, cursor_position)
@@ -95,7 +99,7 @@ pub trait Renderer: crate::Renderer + Sized {
&self,
button: &Button<'_, Message, Self>,
limits: &layout::Limits,
- ) -> Layout;
+ ) -> layout::Node;
/// Draws a [`Button`].
///
@@ -103,7 +107,7 @@ pub trait Renderer: crate::Renderer + Sized {
fn draw<Message>(
&mut self,
button: &Button<'_, Message, Self>,
- layout: &Layout,
+ layout: Layout<'_>,
cursor_position: Point,
) -> Self::Output;
}