diff options
author | 2023-01-08 20:19:36 +0100 | |
---|---|---|
committer | 2023-01-08 20:19:36 +0100 | |
commit | f64e95e2469bd0f8012742a585c41c770634030e (patch) | |
tree | 3bff101359285b4591f9a7116b561fbe14e608bf | |
parent | 19f4373863beb4a0d307dcd6f9632c1736b2355a (diff) | |
download | iced-f64e95e2469bd0f8012742a585c41c770634030e.tar.gz iced-f64e95e2469bd0f8012742a585c41c770634030e.tar.bz2 iced-f64e95e2469bd0f8012742a585c41c770634030e.zip |
Remove `PartialOrd` implementation for `Rectangle`
A `PartialOrd` implementation is unclear for this type, since it has
a position besides its dimensions.
Diffstat (limited to '')
-rw-r--r-- | core/src/rectangle.rs | 6 | ||||
-rw-r--r-- | 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<f32> { } } -impl std::cmp::PartialOrd for Rectangle<f32> { - fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> { - (self.width * self.height).partial_cmp(&(other.width * other.height)) - } -} - impl std::ops::Mul<f32> for Rectangle<f32> { 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<Message>( 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; } |