microsoft/edit
1
0
Fork 0
mirror of https://github.com/microsoft/edit.git synced 2026-06-17 19:34:20 -05:00
Code Issues Packages Projects Releases 3 Wiki Activity

Fix list items stealing Enter presses

Browse Source
This commit is contained in:
Leonard Hecker
2025-03-21 23:23:30 +01:00
parent d681f3bf81
commit 223d0c09e1
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/tui.rs
View File

@@ -2089,29 +2089,17 @@ impl Context<'_, '_> {
let item = self.tree.last_node_ref();
let item_id = item.id;
let selected_before = content.selected == item_id;
// Clicking an item activates it
let clicked = !self.input_consumed
&& (self.input_mouse_gesture == InputMouseGesture::DoubleClick && self.is_hovering());
// Pressing Enter on a selected item activates it as well
let entered = selected_before
&& !self.input_consumed
&& matches!(self.input_keyboard, Some(vk::RETURN));
let activated = clicked || entered;
if activated {
self.set_input_consumed();
}
let focused = self.is_focused();
// Inherit the default selection & Click changes selection
let selected_now =
selected_before || (select && content.selected == 0) || self.is_focused();
let selected_now = selected_before || (select && content.selected == 0) || focused;
// Note down the selected node for keyboard navigation.
if selected_now {
content.selected_node = item;
if !selected_before {
content.selected = item_id;
self.needs_settling = true;
self.set_needs_settling();
}
}
@@ -2119,6 +2107,19 @@ impl Context<'_, '_> {
self.styled_label_add_text(text);
self.styled_label_end();
// Clicking an item activates it
let clicked = !self.input_consumed
&& (self.input_mouse_gesture == InputMouseGesture::DoubleClick && self.is_hovering());
// Pressing Enter on a selected item activates it as well
let entered = focused
&& selected_before
&& !self.input_consumed
&& matches!(self.input_keyboard, Some(vk::RETURN));
let activated = clicked || entered;
if activated {
self.set_input_consumed();
}
if selected_before && activated {
ListSelection::Activated
} else if selected_now && !selected_before {