Skip to content

Fix scrolling in modals #812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lhecker merged 1 commit into from
Apr 23, 2026
+43 −31
Merged

Fix scrolling in modals #812

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 43 additions & 31 deletions crates/edit/src/tui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ use std::{io, iter, mem, ptr, time};

use stdext::arena::{Arena, scratch_arena};
use stdext::collections::{BString, BVec};
use stdext::{arena_format, arena_write_fmt, opt_ptr_eq, str_from_raw_parts};
use stdext::{ReplaceRange, arena_format, arena_write_fmt, opt_ptr_eq, str_from_raw_parts};

use crate::buffer::{CursorMovement, MoveLineDirection, RcTextBuffer, TextBuffer, TextBufferCell};
use crate::cell::*;
Expand Down Expand Up @@ -346,6 +346,8 @@ pub struct Tui {
/// The number of clicks that have happened in a row.
/// Gets reset when the mouse was released for a while.
mouse_click_counter: CoordType,
/// The path to the node that is currently being hovered over.
mouse_hover_node_path: Vec<u64>,
/// The path to the node that was clicked on.
mouse_down_node_path: Vec<u64>,
/// The position of the first click in a double/triple click series.
Expand Down Expand Up @@ -406,6 +408,7 @@ impl Tui {
mouse_state: InputMouseState::None,
mouse_is_drag: false,
mouse_click_counter: 0,
mouse_hover_node_path: Vec::with_capacity(16),
mouse_down_node_path: Vec::with_capacity(16),
first_click_position: Point::MIN,
first_click_target: 0,
Expand All @@ -421,6 +424,7 @@ impl Tui {
settling_want: 0,
read_timeout: time::Duration::MAX,
};
Self::clean_node_path(&mut tui.mouse_hover_node_path);
Self::clean_node_path(&mut tui.mouse_down_node_path);
Self::clean_node_path(&mut tui.focused_node_path);
Ok(tui)
Expand Down Expand Up @@ -583,45 +587,45 @@ impl Tui {

let mut hovered_node = None; // Needed for `mouse_down`
let mut focused_node = None; // Needed for `mouse_down` and `is_click`
if mouse_down || mouse_up {
Copy link
Copy Markdown
Member Author

@lhecker lhecker Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespace suppression: https://github.com/microsoft/edit/pull/812/changes?w=1

// Roots (aka windows) are ordered in Z order, so we iterate
// them in reverse order, from topmost to bottommost.
for root in self.prev_tree.iterate_roots_rev() {
// Find the node that contains the cursor.
Tree::visit_all(root, root, true, |node| {
let n = node.borrow();
if !n.outer_clipped.contains(next_position) {
// Skip the entire sub-tree, because it doesn't contain the cursor.
return VisitControl::SkipChildren;
}
hovered_node = Some(node);
if n.attributes.focusable {
focused_node = Some(node);
}
VisitControl::Continue
});

// This root/window contains the cursor.
// We don't care about any lower roots.
if hovered_node.is_some() {
break;
// Roots (aka windows) are ordered in Z order, so we iterate
// them in reverse order, from topmost to bottommost.
for root in self.prev_tree.iterate_roots_rev() {
// Find the node that contains the cursor.
Tree::visit_all(root, root, true, |node| {
let n = node.borrow();
if !n.outer_clipped.contains(next_position) {
// Skip the entire sub-tree, because it doesn't contain the cursor.
return VisitControl::SkipChildren;
}

// This root is modal and swallows all clicks,
// no matter whether the click was inside it or not.
if matches!(root.borrow().content, NodeContent::Modal(_)) {
break;
hovered_node = Some(node);
if n.attributes.focusable {
focused_node = Some(node);
}
VisitControl::Continue
});

// This root/window contains the cursor.
// We don't care about any lower roots.
if hovered_node.is_some() {
break;
}

// This root is modal and swallows all clicks,
// no matter whether the click was inside it or not.
if matches!(root.borrow().content, NodeContent::Modal(_)) {
break;
}
}

Self::build_node_path(hovered_node, &mut self.mouse_hover_node_path);

if is_scroll {
next_state = self.mouse_state;
} else if is_drag {
self.mouse_is_drag = true;
} else if mouse_down {
// Transition from no mouse input to some mouse input --> Record the mouse down position.
Self::build_node_path(hovered_node, &mut self.mouse_down_node_path);
self.mouse_down_node_path.replace_range(.., &self.mouse_hover_node_path);

// On left-mouse-down we change focus.
let mut target = 0;
Expand Down Expand Up @@ -1251,6 +1255,14 @@ impl Tui {
result
}

fn was_mouse_hover_on_node(&self, id: u64) -> bool {
self.mouse_hover_node_path.last() == Some(&id)
}

fn was_mouse_hover_on_subtree(&self, node: &Node) -> bool {
self.mouse_hover_node_path.get(node.depth) == Some(&node.id)
}

fn was_mouse_down_on_node(&self, id: u64) -> bool {
self.mouse_down_node_path.last() == Some(&id)
}
Expand Down Expand Up @@ -2234,7 +2246,7 @@ impl<'a> Context<'a, '_> {

// Scrolling works even if the node isn't focused.
if self.input_scroll_delta != Point::default()
&& node_prev.inner_clipped.contains(self.tui.mouse_position)
&& self.tui.was_mouse_hover_on_node(node_prev.id)
{
tc.scroll_offset.x += self.input_scroll_delta.x;
tc.scroll_offset.y += self.input_scroll_delta.y;
Expand Down Expand Up @@ -2855,7 +2867,7 @@ impl<'a> Context<'a, '_> {
let container_rect = prev_container.inner;

if self.input_scroll_delta != Point::default()
&& container_rect.contains(self.tui.mouse_position)
&& self.tui.was_mouse_hover_on_subtree(&prev_container)
{
sc.scroll_offset.x += self.input_scroll_delta.x;
sc.scroll_offset.y += self.input_scroll_delta.y;
Expand Down
Loading