Fix text_editor always capturing scroll events

iced-rs · Jun 17, 2024 · 6c1027a · 6c1027a
1 parent e9141e7
commit 6c1027a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/graphics/src/text/editor.rs b/graphics/src/text/editor.rs
@@ -456,14 +456,10 @@ impl editor::Editor for Editor {
                 }
             }
             Action::Scroll { lines } => {
-                let (_, height) = editor.buffer().size();
-
-                if height < i32::MAX as f32 {
-                    editor.action(
-                        font_system.raw(),
-                        cosmic_text::Action::Scroll { lines },
-                    );
-                }
+                editor.action(
+                    font_system.raw(),
+                    cosmic_text::Action::Scroll { lines },
+                );
             }
         }
 

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
@@ -466,6 +466,12 @@ where
                 shell.publish(on_edit(action));
             }
             Update::Scroll(lines) => {
+                let bounds = self.content.0.borrow().editor.bounds();
+
+                if bounds.height >= i32::MAX as f32 {
+                    return event::Status::Ignored;
+                }
+
                 let lines = lines + state.partial_scroll;
                 state.partial_scroll = lines.fract();