alex/rust_minifb
1
0
Fork 0
mirror of https://github.com/italicsjenga/rust_minifb.git synced 2025-01-11 03:21:32 +11:00
Code Issues Packages Projects Releases Wiki Activity

Restored f-keys so the work again

Browse source
This commit is contained in:
Daniel Collin 2016-05-08 11:01:49 +02:00
parent d3fcfd4bf0
commit c6f61804e6
1 changed files with 11 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
examples/menu.rs
View file

@ -6,14 +6,12 @@ use minifb::{MENU_KEY_COMMAND, MENU_KEY_CTRL};
const WIDTH: usize = 640; const WIDTH: usize = 640;
const HEIGHT: usize = 360; const HEIGHT: usize = 360;
/*
const MENU_TEST_ID: usize = 1; const MENU_TEST_ID: usize = 1;
const OTHER_MENU_ID: usize = 2; const OTHER_MENU_ID: usize = 2;
const COLOR_0_ID: usize = 3; const COLOR_0_ID: usize = 3;
const COLOR_1_ID: usize = 4; const COLOR_1_ID: usize = 4;
const COLOR_2_ID: usize = 5; const COLOR_2_ID: usize = 5;
const CLOSE_MENU_ID: usize = 6; const CLOSE_MENU_ID: usize = 6;
*/
fn main() { fn main() {
let mut buffer: Vec<u32> = vec![0; WIDTH * HEIGHT]; let mut buffer: Vec<u32> = vec![0; WIDTH * HEIGHT];
@ -28,84 +26,23 @@ fn main() {
}) })
.expect("Unable to Open Window"); .expect("Unable to Open Window");
// Setup a sub menu let mut menu = Menu::new("Test").unwrap();
let mut sub = Menu::new("Select Color").unwrap();
/* sub.add_item("Color 0", COLOR_0_ID).shortcut(Key::F1, 0).build();
let sub_menu = vec![ sub.add_item("Color 1", COLOR_1_ID).shortcut(Key::F2, 0).build();
Menu { sub.add_item("Color 2", COLOR_2_ID).shortcut(Key::F7, 0).build();
name: "Color 0",
key: Key::F1,
id: COLOR_0_ID,
..Menu::default()
},
Menu {
name: "Color 1",
key: Key::F2,
id: COLOR_1_ID,
..Menu::default()
},
Menu {
name: "Color 2",
key: Key::F12,
id: COLOR_2_ID,
..Menu::default()
},
];
// Main menu menu.add_item("Menu Test", MENU_TEST_ID).shortcut(Key::W, MENU_KEY_CTRL).build();
menu.add_separator();
let menu = vec![ menu.add_item("Other Menu", OTHER_MENU_ID).shortcut(Key::W, MENU_KEY_CTRL).build();
Menu { menu.add_item("Remove Menu", CLOSE_MENU_ID).shortcut(Key::R, 0).build();
name: "Menu Test",
key: Key::W,
id: MENU_TEST_ID,
modifier: MENU_KEY_CTRL,
mac_mod: MENU_KEY_COMMAND,
..Menu::default()
},
Menu::separotor(),
Menu {
name: "Other menu!",
key: Key::S,
modifier: MENU_KEY_CTRL,
mac_mod: MENU_KEY_CTRL,
id: OTHER_MENU_ID,
..Menu::default()
},
Menu {
name: "Remove Menu",
key: Key::R,
id: CLOSE_MENU_ID,
..Menu::default()
},
Menu {
name: "Select Color",
sub_menu: Some(&sub_menu),
..Menu::default()
}
];
*/
//window.add_menu("Test", &menu).expect("Unable to add menu");
let mut menu = Menu::new("TestMenu").unwrap();
let mut sub = Menu::new("SubMenu").unwrap();
menu.add_menu_item(&MenuItem::new("Item 1", 1).shortcut(Key::S, 0));
menu.add_menu_item(&MenuItem::new("Item 2", 2));
menu.add_menu_item(&MenuItem::new("Item 3", 3));
sub.add_item("Test", 0).build();
sub.add_item("Test 2", 0).build();
menu.add_item("", 0).separator().build();
menu.add_item("Some item", 2).shortcut(Key::Y, MENU_KEY_CTRL).build();
menu.add_sub_menu("Sub Test", &sub); menu.add_sub_menu("Sub Test", &sub);
let _ = window.add_menu(&menu); let _ = window.add_menu(&menu);
let color_mul = 1; let mut color_mul = 1;
while window.is_open() && !window.is_key_down(Key::Escape) { while window.is_open() && !window.is_key_down(Key::Escape) {
for y in 0..HEIGHT { for y in 0..HEIGHT {
@ -114,7 +51,6 @@ fn main() {
} }
} }
/*
window.is_menu_pressed().map(|menu_id| { window.is_menu_pressed().map(|menu_id| {
match menu_id { match menu_id {
COLOR_0_ID => { COLOR_0_ID => {
@ -128,14 +64,13 @@ fn main() {
} }
CLOSE_MENU_ID => { CLOSE_MENU_ID => {
println!("remove menu"); println!("remove menu");
//window.remove_menu("Test").expect("Unable to remove menu"); //window.remove_menu(
} }
_ => (), _ => (),
} }
println!("Menu id {} pressed", menu_id); println!("Menu id {} pressed", menu_id);
}); });
*/
window.get_keys().map(|keys| { window.get_keys().map(|keys| {
for t in keys { for t in keys {