gpui: Update Menu name to use SharedString type to support more types (#14791)

Release Notes:

- N/A
This commit is contained in:
Jason Lee
2024-07-19 08:51:31 -04:00
committed by GitHub
parent 836f623800
commit fb541accb2
7 changed files with 40 additions and 38 deletions
+19 -17
View File
@@ -1,18 +1,16 @@
use std::borrow::Cow;
use crate::{Action, AppContext, Platform};
use crate::{Action, AppContext, Platform, SharedString};
use util::ResultExt;
/// A menu of the application, either a main menu or a submenu
pub struct Menu<'a> {
pub struct Menu {
/// The name of the menu
pub name: &'a str,
pub name: SharedString,
/// The items in the menu
pub items: Vec<MenuItem<'a>>,
pub items: Vec<MenuItem>,
}
impl<'a> Menu<'a> {
impl Menu {
/// Create an OwnedMenu from this Menu
pub fn owned(self) -> OwnedMenu {
OwnedMenu {
@@ -23,17 +21,17 @@ impl<'a> Menu<'a> {
}
/// The different kinds of items that can be in a menu
pub enum MenuItem<'a> {
pub enum MenuItem {
/// A separator between items
Separator,
/// A submenu
Submenu(Menu<'a>),
Submenu(Menu),
/// An action that can be performed
Action {
/// The name of this menu item
name: &'a str,
name: SharedString,
/// the action to perform when this menu item is selected
action: Box<dyn Action>,
@@ -44,30 +42,34 @@ pub enum MenuItem<'a> {
},
}
impl<'a> MenuItem<'a> {
impl MenuItem {
/// Creates a new menu item that is a separator
pub fn separator() -> Self {
Self::Separator
}
/// Creates a new menu item that is a submenu
pub fn submenu(menu: Menu<'a>) -> Self {
pub fn submenu(menu: Menu) -> Self {
Self::Submenu(menu)
}
/// Creates a new menu item that invokes an action
pub fn action(name: &'a str, action: impl Action) -> Self {
pub fn action(name: impl Into<SharedString>, action: impl Action) -> Self {
Self::Action {
name,
name: name.into(),
action: Box::new(action),
os_action: None,
}
}
/// Creates a new menu item that invokes an action and has an OS action
pub fn os_action(name: &'a str, action: impl Action, os_action: OsAction) -> Self {
pub fn os_action(
name: impl Into<SharedString>,
action: impl Action,
os_action: OsAction,
) -> Self {
Self::Action {
name,
name: name.into(),
action: Box::new(action),
os_action: Some(os_action),
}
@@ -95,7 +97,7 @@ impl<'a> MenuItem<'a> {
#[derive(Clone)]
pub struct OwnedMenu {
/// The name of the menu
pub name: Cow<'static, str>,
pub name: SharedString,
/// The items in the menu
pub items: Vec<OwnedMenuItem>,
+4 -4
View File
@@ -206,7 +206,7 @@ impl MacPlatform {
for menu_config in menus {
let menu = NSMenu::new(nil).autorelease();
menu.setTitle_(ns_string(menu_config.name));
menu.setTitle_(ns_string(&menu_config.name));
menu.setDelegate_(delegate);
for item_config in menu_config.items {
@@ -310,7 +310,7 @@ impl MacPlatform {
item = NSMenuItem::alloc(nil)
.initWithTitle_action_keyEquivalent_(
ns_string(name),
ns_string(&name),
selector,
ns_string(key_to_native(&keystroke.key).as_ref()),
)
@@ -341,7 +341,7 @@ impl MacPlatform {
} else {
item = NSMenuItem::alloc(nil)
.initWithTitle_action_keyEquivalent_(
ns_string(name),
ns_string(&name),
selector,
ns_string(""),
)
@@ -361,7 +361,7 @@ impl MacPlatform {
submenu.addItem_(Self::create_menu_item(item, delegate, actions, keymap));
}
item.setSubmenu_(submenu);
item.setTitle_(ns_string(name));
item.setTitle_(ns_string(&name));
item
}
}