diff options
Diffstat (limited to 'graphics/src/widget')
| -rw-r--r-- | graphics/src/widget/button.rs | 4 | ||||
| -rw-r--r-- | graphics/src/widget/pick_list.rs | 12 | 
2 files changed, 9 insertions, 7 deletions
| diff --git a/graphics/src/widget/button.rs b/graphics/src/widget/button.rs index 2e3f78ca..60400ed8 100644 --- a/graphics/src/widget/button.rs +++ b/graphics/src/widget/button.rs @@ -5,7 +5,7 @@ use crate::defaults::{self, Defaults};  use crate::{Backend, Primitive, Renderer};  use iced_native::mouse;  use iced_native::{ -    Background, Color, Element, Layout, Point, Rectangle, Vector, +    Background, Color, Element, Layout, Padding, Point, Rectangle, Vector,  };  pub use iced_native::button::State; @@ -21,7 +21,7 @@ impl<B> iced_native::button::Renderer for Renderer<B>  where      B: Backend,  { -    const DEFAULT_PADDING: u16 = 5; +    const DEFAULT_PADDING: Padding = Padding::new(5);      type Style = Box<dyn StyleSheet>; diff --git a/graphics/src/widget/pick_list.rs b/graphics/src/widget/pick_list.rs index f42a8707..c6fbcf76 100644 --- a/graphics/src/widget/pick_list.rs +++ b/graphics/src/widget/pick_list.rs @@ -2,7 +2,8 @@  use crate::backend::{self, Backend};  use crate::{Primitive, Renderer};  use iced_native::{ -    mouse, Font, HorizontalAlignment, Point, Rectangle, VerticalAlignment, +    mouse, Font, HorizontalAlignment, Padding, Point, Rectangle, +    VerticalAlignment,  };  use iced_style::menu; @@ -19,7 +20,7 @@ where  {      type Style = Box<dyn StyleSheet>; -    const DEFAULT_PADDING: u16 = 5; +    const DEFAULT_PADDING: Padding = Padding::new(5);      fn menu_style(style: &Box<dyn StyleSheet>) -> menu::Style {          style.menu() @@ -30,7 +31,7 @@ where          bounds: Rectangle,          cursor_position: Point,          selected: Option<String>, -        padding: u16, +        padding: Padding,          text_size: u16,          font: Font,          style: &Box<dyn StyleSheet>, @@ -56,7 +57,8 @@ where              font: B::ICON_FONT,              size: bounds.height * style.icon_size,              bounds: Rectangle { -                x: bounds.x + bounds.width - f32::from(padding) * 2.0, +                x: bounds.x + bounds.width +                    - f32::from(padding.left + padding.right),                  y: bounds.center_y(),                  ..bounds              }, @@ -74,7 +76,7 @@ where                          font,                          color: style.text_color,                          bounds: Rectangle { -                            x: bounds.x + f32::from(padding), +                            x: bounds.x + f32::from(padding.left),                              y: bounds.center_y(),                              ..bounds                          }, | 
