Skip to content

Commit d4146fd

Browse files
committed
fix: preserve menu item clicks when toggling menus
1 parent 82a7536 commit d4146fd

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

crates/edit/src/tui.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3171,13 +3171,19 @@ impl<'a> Context<'a, '_> {
31713171
&& self.consume_shortcut(kbmod::ALT | InputKey::new(accelerator as u32));
31723172

31733173
let button_id = self.tree.last_node.borrow().id;
3174-
if contains_focus && self.tui.menubar_toggle_id == button_id && self.contains_mouse_down() {
3174+
let mouse_clicked = self.input_mouse_click != 0 && self.button_activated();
3175+
3176+
if mouse_clicked && self.tui.menubar_toggle_id == button_id {
31753177
self.tui.menubar_toggle_id = 0;
31763178
self.tui.pop_focusable_node(1);
31773179

31783180
return false;
31793181
}
31803182

3183+
if mouse_clicked {
3184+
self.tui.menubar_toggle_id = button_id;
3185+
}
3186+
31813187
if contains_focus || keyboard_focus {
31823188
if self.tui.mouse_state != InputMouseState::Left {
31833189
self.tui.menubar_toggle_id = button_id;

0 commit comments

Comments
 (0)