diff options
Diffstat (limited to 'native/src')
-rw-r--r-- | native/src/layout/limits.rs | 4 | ||||
-rw-r--r-- | native/src/overlay/menu.rs | 9 |
2 files changed, 5 insertions, 8 deletions
diff --git a/native/src/layout/limits.rs b/native/src/layout/limits.rs index 0057e3ba..6d5f6563 100644 --- a/native/src/layout/limits.rs +++ b/native/src/layout/limits.rs @@ -119,8 +119,8 @@ impl Limits { /// Shrinks the current [`Limits`] to account for the given padding. pub fn pad(&self, padding: Padding) -> Limits { self.shrink(Size::new( - (padding.left + padding.right) as f32, - (padding.top + padding.bottom) as f32, + padding.horizontal() as f32, + padding.vertical() as f32, )) } diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs index d4375a1d..b5ed07c7 100644 --- a/native/src/overlay/menu.rs +++ b/native/src/overlay/menu.rs @@ -299,7 +299,7 @@ where let size = { let intrinsic = Size::new( 0.0, - f32::from(text_size + self.padding.top + self.padding.bottom) + f32::from(text_size + self.padding.vertical()) * self.options.len() as f32, ); @@ -364,11 +364,8 @@ where *self.hovered_option = Some( ((cursor_position.y - bounds.y) - / f32::from( - text_size - + self.padding.top - + self.padding.bottom, - )) as usize, + / f32::from(text_size + self.padding.vertical())) + as usize, ); if let Some(index) = *self.hovered_option { |