diff options
| author | 2020-03-06 03:30:48 +0100 | |
|---|---|---|
| committer | 2020-03-06 03:30:48 +0100 | |
| commit | f81827c151eba868ab17f35d21a654d48125d0bf (patch) | |
| tree | 6b844fb33fb83dfd61dbb89512fff2b766e4bff5 /native/src/widget | |
| parent | 267e242238fab0aba14fb4c2e27269ce3a3e3951 (diff) | |
| download | iced-f81827c151eba868ab17f35d21a654d48125d0bf.tar.gz iced-f81827c151eba868ab17f35d21a654d48125d0bf.tar.bz2 iced-f81827c151eba868ab17f35d21a654d48125d0bf.zip | |
Remove counterintuitive constant functions
Diffstat (limited to 'native/src/widget')
| -rw-r--r-- | native/src/widget/column.rs | 16 | ||||
| -rw-r--r-- | native/src/widget/image.rs | 4 | ||||
| -rw-r--r-- | native/src/widget/row.rs | 16 | ||||
| -rw-r--r-- | native/src/widget/slider.rs | 4 | ||||
| -rw-r--r-- | native/src/widget/text_input.rs | 11 | 
5 files changed, 24 insertions, 27 deletions
| diff --git a/native/src/widget/column.rs b/native/src/widget/column.rs index 104fdb94..cdcf25af 100644 --- a/native/src/widget/column.rs +++ b/native/src/widget/column.rs @@ -28,7 +28,7 @@ impl<'a, Message, Renderer> Column<'a, Message, Renderer> {      /// Creates an empty [`Column`].      ///      /// [`Column`]: struct.Column.html -    pub const fn new() -> Self { +    pub fn new() -> Self {          Column {              spacing: 0,              padding: 0, @@ -46,7 +46,7 @@ impl<'a, Message, Renderer> Column<'a, Message, Renderer> {      /// Custom margins per element do not exist in Iced. You should use this      /// method instead! While less flexible, it helps you keep spacing between      /// elements consistent. -    pub const fn spacing(mut self, units: u16) -> Self { +    pub fn spacing(mut self, units: u16) -> Self {          self.spacing = units;          self      } @@ -54,7 +54,7 @@ impl<'a, Message, Renderer> Column<'a, Message, Renderer> {      /// Sets the padding of the [`Column`].      ///      /// [`Column`]: struct.Column.html -    pub const fn padding(mut self, units: u16) -> Self { +    pub fn padding(mut self, units: u16) -> Self {          self.padding = units;          self      } @@ -62,7 +62,7 @@ impl<'a, Message, Renderer> Column<'a, Message, Renderer> {      /// Sets the width of the [`Column`].      ///      /// [`Column`]: struct.Column.html -    pub const fn width(mut self, width: Length) -> Self { +    pub fn width(mut self, width: Length) -> Self {          self.width = width;          self      } @@ -70,7 +70,7 @@ impl<'a, Message, Renderer> Column<'a, Message, Renderer> {      /// Sets the height of the [`Column`].      ///      /// [`Column`]: struct.Column.html -    pub const fn height(mut self, height: Length) -> Self { +    pub fn height(mut self, height: Length) -> Self {          self.height = height;          self      } @@ -78,7 +78,7 @@ impl<'a, Message, Renderer> Column<'a, Message, Renderer> {      /// Sets the maximum width of the [`Column`].      ///      /// [`Column`]: struct.Column.html -    pub const fn max_width(mut self, max_width: u32) -> Self { +    pub fn max_width(mut self, max_width: u32) -> Self {          self.max_width = max_width;          self      } @@ -86,7 +86,7 @@ impl<'a, Message, Renderer> Column<'a, Message, Renderer> {      /// Sets the maximum height of the [`Column`] in pixels.      ///      /// [`Column`]: struct.Column.html -    pub const fn max_height(mut self, max_height: u32) -> Self { +    pub fn max_height(mut self, max_height: u32) -> Self {          self.max_height = max_height;          self      } @@ -94,7 +94,7 @@ impl<'a, Message, Renderer> Column<'a, Message, Renderer> {      /// Sets the horizontal alignment of the contents of the [`Column`] .      ///      /// [`Column`]: struct.Column.html -    pub const fn align_items(mut self, align: Align) -> Self { +    pub fn align_items(mut self, align: Align) -> Self {          self.align_items = align;          self      } diff --git a/native/src/widget/image.rs b/native/src/widget/image.rs index 5cfe074f..4c588c9d 100644 --- a/native/src/widget/image.rs +++ b/native/src/widget/image.rs @@ -37,7 +37,7 @@ impl Image {      /// Sets the width of the [`Image`] boundaries.      ///      /// [`Image`]: struct.Image.html -    pub const fn width(mut self, width: Length) -> Self { +    pub fn width(mut self, width: Length) -> Self {          self.width = width;          self      } @@ -45,7 +45,7 @@ impl Image {      /// Sets the height of the [`Image`] boundaries.      ///      /// [`Image`]: struct.Image.html -    pub const fn height(mut self, height: Length) -> Self { +    pub fn height(mut self, height: Length) -> Self {          self.height = height;          self      } diff --git a/native/src/widget/row.rs b/native/src/widget/row.rs index e9b8654c..c854aff7 100644 --- a/native/src/widget/row.rs +++ b/native/src/widget/row.rs @@ -28,7 +28,7 @@ impl<'a, Message, Renderer> Row<'a, Message, Renderer> {      /// Creates an empty [`Row`].      ///      /// [`Row`]: struct.Row.html -    pub const fn new() -> Self { +    pub fn new() -> Self {          Row {              spacing: 0,              padding: 0, @@ -46,7 +46,7 @@ impl<'a, Message, Renderer> Row<'a, Message, Renderer> {      /// Custom margins per element do not exist in Iced. You should use this      /// method instead! While less flexible, it helps you keep spacing between      /// elements consistent. -    pub const fn spacing(mut self, units: u16) -> Self { +    pub fn spacing(mut self, units: u16) -> Self {          self.spacing = units;          self      } @@ -54,7 +54,7 @@ impl<'a, Message, Renderer> Row<'a, Message, Renderer> {      /// Sets the padding of the [`Row`].      ///      /// [`Row`]: struct.Row.html -    pub const fn padding(mut self, units: u16) -> Self { +    pub fn padding(mut self, units: u16) -> Self {          self.padding = units;          self      } @@ -62,7 +62,7 @@ impl<'a, Message, Renderer> Row<'a, Message, Renderer> {      /// Sets the width of the [`Row`].      ///      /// [`Row`]: struct.Row.html -    pub const fn width(mut self, width: Length) -> Self { +    pub fn width(mut self, width: Length) -> Self {          self.width = width;          self      } @@ -70,7 +70,7 @@ impl<'a, Message, Renderer> Row<'a, Message, Renderer> {      /// Sets the height of the [`Row`].      ///      /// [`Row`]: struct.Row.html -    pub const fn height(mut self, height: Length) -> Self { +    pub fn height(mut self, height: Length) -> Self {          self.height = height;          self      } @@ -78,7 +78,7 @@ impl<'a, Message, Renderer> Row<'a, Message, Renderer> {      /// Sets the maximum width of the [`Row`].      ///      /// [`Row`]: struct.Row.html -    pub const fn max_width(mut self, max_width: u32) -> Self { +    pub fn max_width(mut self, max_width: u32) -> Self {          self.max_width = max_width;          self      } @@ -86,7 +86,7 @@ impl<'a, Message, Renderer> Row<'a, Message, Renderer> {      /// Sets the maximum height of the [`Row`].      ///      /// [`Row`]: struct.Row.html -    pub const fn max_height(mut self, max_height: u32) -> Self { +    pub fn max_height(mut self, max_height: u32) -> Self {          self.max_height = max_height;          self      } @@ -94,7 +94,7 @@ impl<'a, Message, Renderer> Row<'a, Message, Renderer> {      /// Sets the vertical alignment of the contents of the [`Row`] .      ///      /// [`Row`]: struct.Row.html -    pub const fn align_items(mut self, align: Align) -> Self { +    pub fn align_items(mut self, align: Align) -> Self {          self.align_items = align;          self      } diff --git a/native/src/widget/slider.rs b/native/src/widget/slider.rs index a8915da1..f07ea7cd 100644 --- a/native/src/widget/slider.rs +++ b/native/src/widget/slider.rs @@ -95,8 +95,8 @@ impl State {      /// Creates a new [`State`].      ///      /// [`State`]: struct.State.html -    pub const fn new() -> State { -        State { is_dragging: false } +    pub fn new() -> State { +        State::default()      }  } diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index 0246f0d5..f97ed424 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -326,17 +326,14 @@ impl State {      /// Creates a new [`State`], representing an unfocused [`TextInput`].      ///      /// [`State`]: struct.State.html -    pub const fn new() -> Self { -        Self { -            is_focused: false, -            cursor_position: 0, -        } +    pub fn new() -> Self { +        Self::default()      }      /// Creates a new [`State`], representing a focused [`TextInput`].      ///      /// [`State`]: struct.State.html -    pub const fn focused() -> Self { +    pub fn focused() -> Self {          use std::usize;          Self { @@ -348,7 +345,7 @@ impl State {      /// Returns whether the [`TextInput`] is currently focused or not.      ///      /// [`TextInput`]: struct.TextInput.html -    pub const fn is_focused(&self) -> bool { +    pub fn is_focused(&self) -> bool {          self.is_focused      } | 
