Closes https://github.com/zed-industries/zed/issues/23894 Reworks all trigger declarations from `.trigger(element.tooltip(tooltip))` into `.trigger_with_tooltip(element, tooltip)` , with new API disallowing simultaneous trigger and tooltip display. All existing `.trigger(` calls were replaced, except 2 not applicable (in dock.rs and pane.rs), 15 left as ones without tooltips, and 2 unchanged places in `inline_completion_button.rs`, where https://github.com/zed-industries/zed/blob/0f7bb2e9fd6dc1fe3f0127de19df372f75ad0c4f/crates/inline_completion_button/src/inline_completion_button.rs#L311-L319 `with_animation` does not allow us to simply use the same approach. Release Notes: - Fixed hover tooltips appearing after related element is pressed --------- Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
295 lines
10 KiB
Rust
295 lines
10 KiB
Rust
use gpui::{Entity, OwnedMenu, OwnedMenuItem};
|
|
|
|
#[cfg(not(target_os = "macos"))]
|
|
use gpui::{actions, impl_actions};
|
|
|
|
#[cfg(not(target_os = "macos"))]
|
|
use schemars::JsonSchema;
|
|
#[cfg(not(target_os = "macos"))]
|
|
use serde::Deserialize;
|
|
|
|
use smallvec::SmallVec;
|
|
use ui::{prelude::*, ContextMenu, PopoverMenu, PopoverMenuHandle, Tooltip};
|
|
|
|
#[cfg(not(target_os = "macos"))]
|
|
impl_actions!(app_menu, [OpenApplicationMenu]);
|
|
|
|
#[cfg(not(target_os = "macos"))]
|
|
actions!(app_menu, [ActivateMenuRight, ActivateMenuLeft]);
|
|
|
|
#[cfg(not(target_os = "macos"))]
|
|
#[derive(Clone, Deserialize, JsonSchema, PartialEq, Default)]
|
|
pub struct OpenApplicationMenu(String);
|
|
|
|
#[cfg(not(target_os = "macos"))]
|
|
pub enum ActivateDirection {
|
|
Left,
|
|
Right,
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
struct MenuEntry {
|
|
menu: OwnedMenu,
|
|
handle: PopoverMenuHandle<ContextMenu>,
|
|
}
|
|
|
|
pub struct ApplicationMenu {
|
|
entries: SmallVec<[MenuEntry; 8]>,
|
|
pending_menu_open: Option<String>,
|
|
}
|
|
|
|
impl ApplicationMenu {
|
|
pub fn new(_: &mut Window, cx: &mut Context<Self>) -> Self {
|
|
let menus = cx.get_menus().unwrap_or_default();
|
|
Self {
|
|
entries: menus
|
|
.into_iter()
|
|
.map(|menu| MenuEntry {
|
|
menu,
|
|
handle: PopoverMenuHandle::default(),
|
|
})
|
|
.collect(),
|
|
pending_menu_open: None,
|
|
}
|
|
}
|
|
|
|
fn sanitize_menu_items(items: Vec<OwnedMenuItem>) -> Vec<OwnedMenuItem> {
|
|
let mut cleaned = Vec::new();
|
|
let mut last_was_separator = false;
|
|
|
|
for item in items {
|
|
match item {
|
|
OwnedMenuItem::Separator => {
|
|
if !last_was_separator {
|
|
cleaned.push(item);
|
|
last_was_separator = true;
|
|
}
|
|
}
|
|
OwnedMenuItem::Submenu(submenu) => {
|
|
// Skip empty submenus
|
|
if !submenu.items.is_empty() {
|
|
cleaned.push(OwnedMenuItem::Submenu(submenu));
|
|
last_was_separator = false;
|
|
}
|
|
}
|
|
item => {
|
|
cleaned.push(item);
|
|
last_was_separator = false;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Remove trailing separator
|
|
if let Some(OwnedMenuItem::Separator) = cleaned.last() {
|
|
cleaned.pop();
|
|
}
|
|
|
|
cleaned
|
|
}
|
|
|
|
fn build_menu_from_items(
|
|
entry: MenuEntry,
|
|
window: &mut Window,
|
|
cx: &mut App,
|
|
) -> Entity<ContextMenu> {
|
|
ContextMenu::build(window, cx, |menu, window, cx| {
|
|
// Grab current focus handle so menu can shown items in context with the focused element
|
|
let menu = menu.when_some(window.focused(cx), |menu, focused| menu.context(focused));
|
|
let sanitized_items = Self::sanitize_menu_items(entry.menu.items);
|
|
|
|
sanitized_items
|
|
.into_iter()
|
|
.fold(menu, |menu, item| match item {
|
|
OwnedMenuItem::Separator => menu.separator(),
|
|
OwnedMenuItem::Action { name, action, .. } => menu.action(name, action),
|
|
OwnedMenuItem::Submenu(submenu) => {
|
|
submenu
|
|
.items
|
|
.into_iter()
|
|
.fold(menu, |menu, item| match item {
|
|
OwnedMenuItem::Separator => menu.separator(),
|
|
OwnedMenuItem::Action { name, action, .. } => {
|
|
menu.action(name, action)
|
|
}
|
|
OwnedMenuItem::Submenu(_) => menu,
|
|
})
|
|
}
|
|
})
|
|
})
|
|
}
|
|
|
|
fn render_application_menu(&self, entry: &MenuEntry) -> impl IntoElement {
|
|
let handle = entry.handle.clone();
|
|
|
|
let menu_name = entry.menu.name.clone();
|
|
let entry = entry.clone();
|
|
|
|
// Application menu must have same ids as first menu item in standard menu
|
|
div()
|
|
.id(SharedString::from(format!("{}-menu-item", menu_name)))
|
|
.occlude()
|
|
.child(
|
|
PopoverMenu::new(SharedString::from(format!("{}-menu-popover", menu_name)))
|
|
.menu(move |window, cx| {
|
|
Self::build_menu_from_items(entry.clone(), window, cx).into()
|
|
})
|
|
.trigger_with_tooltip(
|
|
IconButton::new(
|
|
SharedString::from(format!("{}-menu-trigger", menu_name)),
|
|
ui::IconName::Menu,
|
|
)
|
|
.style(ButtonStyle::Subtle)
|
|
.icon_size(IconSize::Small),
|
|
Tooltip::text("Open Application Menu"),
|
|
)
|
|
.with_handle(handle),
|
|
)
|
|
}
|
|
|
|
fn render_standard_menu(&self, entry: &MenuEntry) -> impl IntoElement {
|
|
let current_handle = entry.handle.clone();
|
|
|
|
let menu_name = entry.menu.name.clone();
|
|
let entry = entry.clone();
|
|
|
|
let all_handles: Vec<_> = self
|
|
.entries
|
|
.iter()
|
|
.map(|entry| entry.handle.clone())
|
|
.collect();
|
|
|
|
div()
|
|
.id(SharedString::from(format!("{}-menu-item", menu_name)))
|
|
.occlude()
|
|
.child(
|
|
PopoverMenu::new(SharedString::from(format!("{}-menu-popover", menu_name)))
|
|
.menu(move |window, cx| {
|
|
Self::build_menu_from_items(entry.clone(), window, cx).into()
|
|
})
|
|
.trigger(
|
|
Button::new(
|
|
SharedString::from(format!("{}-menu-trigger", menu_name)),
|
|
menu_name.clone(),
|
|
)
|
|
.style(ButtonStyle::Subtle)
|
|
.label_size(LabelSize::Small),
|
|
)
|
|
.with_handle(current_handle.clone()),
|
|
)
|
|
.on_hover(move |hover_enter, window, cx| {
|
|
if *hover_enter && !current_handle.is_deployed() {
|
|
all_handles.iter().for_each(|h| h.hide(cx));
|
|
|
|
// We need to defer this so that this menu handle can take focus from the previous menu
|
|
let handle = current_handle.clone();
|
|
window.defer(cx, move |window, cx| handle.show(window, cx));
|
|
}
|
|
})
|
|
}
|
|
|
|
#[cfg(not(target_os = "macos"))]
|
|
pub fn open_menu(
|
|
&mut self,
|
|
action: &OpenApplicationMenu,
|
|
_window: &mut Window,
|
|
_cx: &mut Context<Self>,
|
|
) {
|
|
self.pending_menu_open = Some(action.0.clone());
|
|
}
|
|
|
|
#[cfg(not(target_os = "macos"))]
|
|
pub fn navigate_menus_in_direction(
|
|
&mut self,
|
|
direction: ActivateDirection,
|
|
window: &mut Window,
|
|
cx: &mut Context<Self>,
|
|
) {
|
|
let current_index = self
|
|
.entries
|
|
.iter()
|
|
.position(|entry| entry.handle.is_deployed());
|
|
let Some(current_index) = current_index else {
|
|
return;
|
|
};
|
|
|
|
let next_index = match direction {
|
|
ActivateDirection::Left => {
|
|
if current_index == 0 {
|
|
self.entries.len() - 1
|
|
} else {
|
|
current_index - 1
|
|
}
|
|
}
|
|
ActivateDirection::Right => {
|
|
if current_index == self.entries.len() - 1 {
|
|
0
|
|
} else {
|
|
current_index + 1
|
|
}
|
|
}
|
|
};
|
|
|
|
self.entries[current_index].handle.hide(cx);
|
|
|
|
// We need to defer this so that this menu handle can take focus from the previous menu
|
|
let next_handle = self.entries[next_index].handle.clone();
|
|
cx.defer_in(window, move |_, window, cx| next_handle.show(window, cx));
|
|
}
|
|
|
|
pub fn all_menus_shown(&self) -> bool {
|
|
self.entries.iter().any(|entry| entry.handle.is_deployed())
|
|
|| self.pending_menu_open.is_some()
|
|
}
|
|
}
|
|
|
|
impl Render for ApplicationMenu {
|
|
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
|
|
let all_menus_shown = self.all_menus_shown();
|
|
|
|
if let Some(pending_menu_open) = self.pending_menu_open.take() {
|
|
if let Some(entry) = self
|
|
.entries
|
|
.iter()
|
|
.find(|entry| entry.menu.name == pending_menu_open && !entry.handle.is_deployed())
|
|
{
|
|
let handle_to_show = entry.handle.clone();
|
|
let handles_to_hide: Vec<_> = self
|
|
.entries
|
|
.iter()
|
|
.filter(|e| e.menu.name != pending_menu_open && e.handle.is_deployed())
|
|
.map(|e| e.handle.clone())
|
|
.collect();
|
|
|
|
if handles_to_hide.is_empty() {
|
|
// We need to wait for the next frame to show all menus first,
|
|
// before we can handle show/hide operations
|
|
window.on_next_frame(move |window, cx| {
|
|
handles_to_hide.iter().for_each(|handle| handle.hide(cx));
|
|
window.defer(cx, move |window, cx| handle_to_show.show(window, cx));
|
|
});
|
|
} else {
|
|
// Since menus are already shown, we can directly handle show/hide operations
|
|
handles_to_hide.iter().for_each(|handle| handle.hide(cx));
|
|
cx.defer_in(window, move |_, window, cx| handle_to_show.show(window, cx));
|
|
}
|
|
}
|
|
}
|
|
|
|
div()
|
|
.key_context("ApplicationMenu")
|
|
.flex()
|
|
.flex_row()
|
|
.gap_x_1()
|
|
.when(!all_menus_shown && !self.entries.is_empty(), |this| {
|
|
this.child(self.render_application_menu(&self.entries[0]))
|
|
})
|
|
.when(all_menus_shown, |this| {
|
|
this.children(
|
|
self.entries
|
|
.iter()
|
|
.map(|entry| self.render_standard_menu(entry)),
|
|
)
|
|
})
|
|
}
|
|
}
|