Skip to content

Commit b11a1b7

Browse files
committed
move it
1 parent 383fc1d commit b11a1b7

File tree

3 files changed

+22
-13
lines changed

3 files changed

+22
-13
lines changed

src/ui/src/actions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
use gpui::actions;
22

3-
actions!(scope, [Quit]);
3+
actions!(scope, [Quit, Hide]);

src/ui/src/main.rs

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,20 @@ impl AssetSource for Assets {
2626
}
2727
}
2828

29-
actions!(main_menu, [Quit]);
30-
3129
fn init(_: Arc<AppState>, cx: &mut AppContext) -> Result<()> {
3230
components::init(cx);
3331

34-
cx.bind_keys([KeyBinding::new("cmd-q", Quit, None)]);
32+
if cfg!(target_os = "macos") {
33+
cx.bind_keys(vec![KeyBinding::new("cmd-q", actions::Quit, None)]);
34+
cx.bind_keys(vec![KeyBinding::new("cmd-h", actions::Hide, None)]);
35+
} else {
36+
cx.bind_keys(vec![KeyBinding::new("ctrl-h", actions::Hide, None)]);
37+
}
38+
39+
cx.set_menus(app_menus());
40+
41+
cx.on_action(|_: &actions::Quit, cx| cx.quit());
42+
cx.on_action(|_: &actions::Hide, cx| cx.hide());
3543

3644
Ok(())
3745
}
@@ -50,11 +58,6 @@ async fn main() {
5058
return;
5159
}
5260

53-
cx.bind_keys(vec![KeyBinding::new("cmd-q", actions::Quit, None)]);
54-
55-
cx.set_menus(app_menus());
56-
cx.on_action(|_: &Quit, cx| cx.quit());
57-
5861
let mut theme = Theme::from(ThemeColor::dark());
5962
theme.mode = ThemeMode::Dark;
6063
theme.accent = hsl(335.0, 97.0, 61.0);

src/ui/src/menu.rs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,14 @@ use gpui::{Menu, MenuItem};
33
use crate::actions;
44

55
pub fn app_menus() -> Vec<Menu> {
6-
vec![Menu {
7-
name: "Scope".into(),
8-
items: vec![MenuItem::action("Quit", actions::Quit)],
9-
}]
6+
vec![
7+
Menu {
8+
name: "Scope".into(),
9+
items: vec![MenuItem::action("Quit", actions::Quit)],
10+
},
11+
Menu {
12+
name: "Window".into(),
13+
items: vec![MenuItem::action("Hide", actions::Hide)],
14+
},
15+
]
1016
}

0 commit comments

Comments
 (0)