summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/src/rectangle.rs6
-rw-r--r--native/src/widget/scrollable.rs4
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;
}