Skip to content
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

Add nsmenu title #1846

Merged
merged 8 commits into from
Jul 27, 2021
Merged

Add nsmenu title #1846

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
def20a1
Use `::alloc().initWithTitle` to initialize a NSMenu
terhechte Jul 1, 2021
752d450
Update Examples
terhechte Jul 1, 2021
31621a8
Make druid compile. Not sure what the correct titles would be.
terhechte Jul 1, 2021
0837856
Remove new(title) in favour of new() with set_title
terhechte Jul 3, 2021
6b70f92
Update examples
terhechte Jul 3, 2021
bda8710
Add NOP set_title for other platforms
terhechte Jul 3, 2021
72e6a82
Merge branch 'master' into add-nsmenu-title
terhechte Jul 23, 2021
728510d
Simplify Menu implementation by removing `set_title` again
terhechte Jul 23, 2021
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
5 changes: 3 additions & 2 deletions druid-shell/src/backend/mac/menu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

use cocoa::appkit::{NSEventModifierFlags, NSMenu, NSMenuItem};
use cocoa::base::{id, nil, NO};
use cocoa::foundation::NSAutoreleasePool;
use cocoa::foundation::{NSAutoreleasePool, NSString};
use objc::{msg_send, sel, sel_impl};

use super::util::make_nsstring;
Expand Down Expand Up @@ -59,7 +59,8 @@ fn make_menu_item(id: u32, text: &str, key: Option<&HotKey>, enabled: bool, sele
impl Menu {
pub fn new() -> Menu {
unsafe {
let menu = NSMenu::alloc(nil).autorelease();
let title = NSString::alloc(nil).init_str("").autorelease();
let menu = NSMenu::alloc(nil).initWithTitle_(title).autorelease();
let () = msg_send![menu, setAutoenablesItems: NO];
Menu { menu }
}
Expand Down