Fixed issue where the NextScreen action would never have an effect

Mikayla Maki created 3 years ago

Change summary

crates/editor/src/editor.rs         | 1 -
crates/editor/src/scroll/actions.rs | 6 +++---
2 files changed, 3 insertions(+), 4 deletions(-)

Detailed changes

crates/editor/src/editor.rs

@@ -184,7 +184,6 @@ actions!(
         Paste,
         Undo,
         Redo,
-        NextScreen,
         MoveUp,
         PageUp,
         MoveDown,

crates/editor/src/scroll/actions.rs

@@ -64,15 +64,15 @@ impl Editor {
             return None;
         }
 
-        self.context_menu.as_mut()?;
+        if self.mouse_context_menu.read(cx).visible() {
+            return None;
+        }
 
         if matches!(self.mode, EditorMode::SingleLine) {
             cx.propagate_action();
             return None;
         }
-
         self.request_autoscroll(Autoscroll::Next, cx);
-
         Some(())
     }