From f64e95e2469bd0f8012742a585c41c770634030e Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 8 Jan 2023 20:19:36 +0100 Subject: Remove `PartialOrd` implementation for `Rectangle` A `PartialOrd` implementation is unclear for this type, since it has a position besides its dimensions. --- core/src/rectangle.rs | 6 ------ native/src/widget/scrollable.rs | 4 +++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/core/src/rectangle.rs b/core/src/rectangle.rs index c6e6fce4..4fe91519 100644 --- a/core/src/rectangle.rs +++ b/core/src/rectangle.rs @@ -111,12 +111,6 @@ impl Rectangle { } } -impl std::cmp::PartialOrd for Rectangle { - fn partial_cmp(&self, other: &Self) -> Option { - (self.width * self.height).partial_cmp(&(other.width * other.height)) - } -} - impl std::ops::Mul for Rectangle { type Output = Self; diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs index efd66d1b..46b757b9 100644 --- a/native/src/widget/scrollable.rs +++ b/native/src/widget/scrollable.rs @@ -896,7 +896,9 @@ fn notify_on_scroll( shell: &mut Shell<'_, Message>, ) { if let Some(on_scroll) = on_scroll { - if content_bounds <= bounds { + if content_bounds.width <= bounds.width + && content_bounds.height <= bounds.height + { return; } -- cgit