mirror of
https://github.com/rust-windowing/winit.git
synced 2026-08-29 04:40:04 -04:00
macOS: default menu uses bundle name
Use the bundle name in the default menu or fall back to using the process name as before.
This commit is contained in:
@@ -2,7 +2,7 @@ use objc2::rc::Retained;
|
|||||||
use objc2::runtime::Sel;
|
use objc2::runtime::Sel;
|
||||||
use objc2::{sel, MainThreadMarker};
|
use objc2::{sel, MainThreadMarker};
|
||||||
use objc2_app_kit::{NSApplication, NSEventModifierFlags, NSMenu, NSMenuItem};
|
use objc2_app_kit::{NSApplication, NSEventModifierFlags, NSMenu, NSMenuItem};
|
||||||
use objc2_foundation::{ns_string, NSProcessInfo, NSString};
|
use objc2_foundation::{ns_string, NSBundle, NSProcessInfo, NSString};
|
||||||
|
|
||||||
struct KeyEquivalent<'a> {
|
struct KeyEquivalent<'a> {
|
||||||
key: &'a NSString,
|
key: &'a NSString,
|
||||||
@@ -16,7 +16,10 @@ pub fn initialize(app: &NSApplication) {
|
|||||||
menubar.addItem(&app_menu_item);
|
menubar.addItem(&app_menu_item);
|
||||||
|
|
||||||
let app_menu = NSMenu::new(mtm);
|
let app_menu = NSMenu::new(mtm);
|
||||||
let process_name = NSProcessInfo::processInfo().processName();
|
let process_name = match NSBundle::mainBundle().name() {
|
||||||
|
Some(bundle_name) => bundle_name,
|
||||||
|
None => NSProcessInfo::processInfo().processName(),
|
||||||
|
};
|
||||||
|
|
||||||
// About menu item
|
// About menu item
|
||||||
let about_item_title = ns_string!("About ").stringByAppendingString(&process_name);
|
let about_item_title = ns_string!("About ").stringByAppendingString(&process_name);
|
||||||
|
|||||||
@@ -174,6 +174,7 @@ changelog entry.
|
|||||||
- Rename `VideoModeHandle` to `VideoMode`, now it only stores plain data.
|
- Rename `VideoModeHandle` to `VideoMode`, now it only stores plain data.
|
||||||
- Make `Fullscreen::Exclusive` contain `(MonitorHandle, VideoMode)`.
|
- Make `Fullscreen::Exclusive` contain `(MonitorHandle, VideoMode)`.
|
||||||
- Reworked the file drag-and-drop API.
|
- Reworked the file drag-and-drop API.
|
||||||
|
- On macOS, the default menu uses the bundle name or falls back to the process name as before.
|
||||||
|
|
||||||
The `WindowEvent::DroppedFile`, `WindowEvent::HoveredFile` and `WindowEvent::HoveredFileCancelled`
|
The `WindowEvent::DroppedFile`, `WindowEvent::HoveredFile` and `WindowEvent::HoveredFileCancelled`
|
||||||
events have been removed, and replaced with `WindowEvent::DragEntered`, `WindowEvent::DragMoved`,
|
events have been removed, and replaced with `WindowEvent::DragEntered`, `WindowEvent::DragMoved`,
|
||||||
|
|||||||
Reference in New Issue
Block a user