Implement default macOS menu items
- `Zed -> Hide`, bound to `cmd-h` - `Zed -> Hide Others`, bound to `alt-cmd-h` - `Zed -> Show All` - `Window -> Minimize`, bound to `cmd-m` - `Window -> Zoom`
This commit is contained in:
@@ -1319,6 +1319,16 @@ impl MutableAppContext {
|
||||
window.show_character_palette();
|
||||
}
|
||||
|
||||
pub fn minimize_window(&self, window_id: usize) {
|
||||
let (_, window) = &self.presenters_and_platform_windows[&window_id];
|
||||
window.minimize();
|
||||
}
|
||||
|
||||
pub fn zoom_window(&self, window_id: usize) {
|
||||
let (_, window) = &self.presenters_and_platform_windows[&window_id];
|
||||
window.zoom();
|
||||
}
|
||||
|
||||
fn prompt(
|
||||
&self,
|
||||
window_id: usize,
|
||||
@@ -3686,6 +3696,14 @@ impl<'a, T: View> ViewContext<'a, T> {
|
||||
self.app.show_character_palette(self.window_id);
|
||||
}
|
||||
|
||||
pub fn minimize_window(&self) {
|
||||
self.app.minimize_window(self.window_id)
|
||||
}
|
||||
|
||||
pub fn zoom_window(&self) {
|
||||
self.app.zoom_window(self.window_id)
|
||||
}
|
||||
|
||||
pub fn prompt(
|
||||
&self,
|
||||
level: PromptLevel,
|
||||
|
||||
@@ -46,6 +46,9 @@ pub trait Platform: Send + Sync {
|
||||
executor: Rc<executor::Foreground>,
|
||||
) -> Box<dyn Window>;
|
||||
fn key_window_id(&self) -> Option<usize>;
|
||||
fn hide(&self);
|
||||
fn hide_other_apps(&self);
|
||||
fn unhide_other_apps(&self);
|
||||
fn quit(&self);
|
||||
|
||||
fn write_to_clipboard(&self, item: ClipboardItem);
|
||||
@@ -117,6 +120,8 @@ pub trait Window: WindowContext {
|
||||
fn set_title(&mut self, title: &str);
|
||||
fn set_edited(&mut self, edited: bool);
|
||||
fn show_character_palette(&self);
|
||||
fn minimize(&self);
|
||||
fn zoom(&self);
|
||||
}
|
||||
|
||||
pub trait WindowContext {
|
||||
|
||||
@@ -456,6 +456,27 @@ impl platform::Platform for MacPlatform {
|
||||
self.fonts.clone()
|
||||
}
|
||||
|
||||
fn hide(&self) {
|
||||
unsafe {
|
||||
let app = NSApplication::sharedApplication(nil);
|
||||
let _: () = msg_send![app, hide: nil];
|
||||
}
|
||||
}
|
||||
|
||||
fn hide_other_apps(&self) {
|
||||
unsafe {
|
||||
let app = NSApplication::sharedApplication(nil);
|
||||
let _: () = msg_send![app, hideOtherApplications: nil];
|
||||
}
|
||||
}
|
||||
|
||||
fn unhide_other_apps(&self) {
|
||||
unsafe {
|
||||
let app = NSApplication::sharedApplication(nil);
|
||||
let _: () = msg_send![app, unhideAllApplications: nil];
|
||||
}
|
||||
}
|
||||
|
||||
fn quit(&self) {
|
||||
// Quitting the app causes us to close windows, which invokes `Window::on_close` callbacks
|
||||
// synchronously before this method terminates. If we call `Platform::quit` while holding a
|
||||
|
||||
@@ -568,6 +568,25 @@ impl platform::Window for Window {
|
||||
let _: () = msg_send![app, orderFrontCharacterPalette: window];
|
||||
}
|
||||
}
|
||||
|
||||
fn minimize(&self) {
|
||||
let window = self.0.borrow().native_window;
|
||||
unsafe {
|
||||
window.miniaturize_(nil);
|
||||
}
|
||||
}
|
||||
|
||||
fn zoom(&self) {
|
||||
let this = self.0.borrow();
|
||||
let window = this.native_window;
|
||||
this.executor
|
||||
.spawn(async move {
|
||||
unsafe {
|
||||
window.zoom_(nil);
|
||||
}
|
||||
})
|
||||
.detach();
|
||||
}
|
||||
}
|
||||
|
||||
impl platform::WindowContext for Window {
|
||||
|
||||
@@ -135,6 +135,12 @@ impl super::Platform for Platform {
|
||||
None
|
||||
}
|
||||
|
||||
fn hide(&self) {}
|
||||
|
||||
fn hide_other_apps(&self) {}
|
||||
|
||||
fn unhide_other_apps(&self) {}
|
||||
|
||||
fn quit(&self) {}
|
||||
|
||||
fn write_to_clipboard(&self, item: ClipboardItem) {
|
||||
@@ -278,6 +284,10 @@ impl super::Window for Window {
|
||||
}
|
||||
|
||||
fn show_character_palette(&self) {}
|
||||
|
||||
fn minimize(&self) {}
|
||||
|
||||
fn zoom(&self) {}
|
||||
}
|
||||
|
||||
pub fn platform() -> Platform {
|
||||
|
||||
Reference in New Issue
Block a user