alex/muda
1
0
Fork 0
mirror of https://github.com/italicsjenga/muda.git synced 2024-10-16 21:51:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

refactor(example): clean up wry example (#108)

Browse source
This commit is contained in:
Linda_pp 2023-08-30 23:43:06 +09:00 committed by GitHub
parent bc4c86bfbb
commit 89154aede0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 75 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

130
examples/wry.rs
View file

@ -15,7 +15,7 @@ use wry::application::platform::unix::WindowExtUnix;
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
use wry::application::platform::windows::{EventLoopBuilderExtWindows, WindowExtWindows}; use wry::application::platform::windows::{EventLoopBuilderExtWindows, WindowExtWindows};
use wry::application::{ use wry::application::{
event::{ElementState, Event, MouseButton, WindowEvent}, event::{Event, WindowEvent},
event_loop::{ControlFlow, EventLoopBuilder}, event_loop::{ControlFlow, EventLoopBuilder},
window::{Window, WindowBuilder}, window::{Window, WindowBuilder},
}; };
@ -50,30 +50,33 @@ fn main() -> wry::Result<()> {
.with_title("Window 2") .with_title("Window 2")
.build(&event_loop) .build(&event_loop)
.unwrap(); .unwrap();
let window2_id = window2.id();
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
{ {
let app_m = Submenu::new("App", true); let app_m = Submenu::new("App", true);
menu_bar.append(&app_m); menu_bar.append(&app_m).unwrap();
app_m.append_items(&[ app_m
&PredefinedMenuItem::about(None, None), .append_items(&[
&PredefinedMenuItem::separator(), &PredefinedMenuItem::about(None, None),
&PredefinedMenuItem::services(None), &PredefinedMenuItem::separator(),
&PredefinedMenuItem::separator(), &PredefinedMenuItem::services(None),
&PredefinedMenuItem::hide(None), &PredefinedMenuItem::separator(),
&PredefinedMenuItem::hide_others(None), &PredefinedMenuItem::hide(None),
&PredefinedMenuItem::show_all(None), &PredefinedMenuItem::hide_others(None),
&PredefinedMenuItem::separator(), &PredefinedMenuItem::show_all(None),
&PredefinedMenuItem::quit(None), &PredefinedMenuItem::separator(),
]); &PredefinedMenuItem::quit(None),
])
.unwrap();
} }
let file_m = Submenu::new("&File", true); let file_m = Submenu::new("&File", true);
let edit_m = Submenu::new("&Edit", true); let edit_m = Submenu::new("&Edit", true);
let window_m = Submenu::new("&Window", true); let window_m = Submenu::new("&Window", true);
menu_bar.append_items(&[&file_m, &edit_m, &window_m]); menu_bar
.append_items(&[&file_m, &edit_m, &window_m])
.unwrap();
let custom_i_1 = MenuItem::new( let custom_i_1 = MenuItem::new(
"C&ustom 1", "C&ustom 1",
@ -103,45 +106,61 @@ fn main() -> wry::Result<()> {
let cut_i = PredefinedMenuItem::cut(None); let cut_i = PredefinedMenuItem::cut(None);
let paste_i = PredefinedMenuItem::paste(None); let paste_i = PredefinedMenuItem::paste(None);
file_m.append_items(&[ file_m
&custom_i_1, .append_items(&[
&image_item, &custom_i_1,
&window_m, &image_item,
&PredefinedMenuItem::separator(), &window_m,
&check_custom_i_1, &PredefinedMenuItem::separator(),
&check_custom_i_2, &check_custom_i_1,
]); &check_custom_i_2,
])
.unwrap();
window_m.append_items(&[ window_m
&PredefinedMenuItem::minimize(None), .append_items(&[
&PredefinedMenuItem::maximize(None), &PredefinedMenuItem::minimize(None),
&PredefinedMenuItem::close_window(Some("Close")), &PredefinedMenuItem::maximize(None),
&PredefinedMenuItem::fullscreen(None), &PredefinedMenuItem::close_window(Some("Close")),
&PredefinedMenuItem::about( &PredefinedMenuItem::fullscreen(None),
None, &PredefinedMenuItem::about(
Some(AboutMetadata { None,
name: Some("tao".to_string()), Some(AboutMetadata {
version: Some("1.2.3".to_string()), name: Some("tao".to_string()),
copyright: Some("Copyright tao".to_string()), version: Some("1.2.3".to_string()),
..Default::default() copyright: Some("Copyright tao".to_string()),
}), ..Default::default()
), }),
&check_custom_i_3, ),
&image_item, &check_custom_i_3,
&custom_i_1, &image_item,
]); &custom_i_1,
])
.unwrap();
edit_m.append_items(&[&copy_i, &PredefinedMenuItem::separator(), &paste_i]); edit_m
.append_items(&[
&copy_i,
&PredefinedMenuItem::separator(),
&cut_i,
&PredefinedMenuItem::separator(),
&paste_i,
])
.unwrap();
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
{ {
menu_bar.init_for_hwnd(window.hwnd() as _); menu_bar.init_for_hwnd(window.hwnd() as _).unwrap();
menu_bar.init_for_hwnd(window2.hwnd() as _); menu_bar.init_for_hwnd(window2.hwnd() as _).unwrap();
} }
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
{ {
menu_bar.init_for_gtk_window(window.gtk_window(), window.default_vbox()); menu_bar
menu_bar.init_for_gtk_window(window2.gtk_window(), window2.default_vbox()); .init_for_gtk_window(window.gtk_window(), window.default_vbox())
.unwrap();
menu_bar
.init_for_gtk_window(window2.gtk_window(), window2.default_vbox())
.unwrap();
} }
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
{ {
@ -205,14 +224,12 @@ fn main() -> wry::Result<()> {
.unwrap(); .unwrap();
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
if let Some(menu_bar) = menu_bar
.clone()
.gtk_menubar_for_gtk_window(window.gtk_window())
{ {
if let Some(menu_bar) = menu_bar use gtk::prelude::*;
.clone() y += menu_bar.allocated_height();
.gtk_menubar_for_gtk_window(window.gtk_window())
{
use gtk::prelude::*;
y += menu_bar.allocated_height();
}
} }
show_context_menu( show_context_menu(
@ -248,8 +265,11 @@ fn main() -> wry::Result<()> {
if let Ok(event) = menu_channel.try_recv() { if let Ok(event) = menu_channel.try_recv() {
if event.id == custom_i_1.id() { if event.id == custom_i_1.id() {
custom_i_1 custom_i_1
.set_accelerator(Some(Accelerator::new(Some(Modifiers::SHIFT), Code::KeyF))); .set_accelerator(Some(Accelerator::new(Some(Modifiers::SHIFT), Code::KeyF)))
file_m.insert(&MenuItem::new("New Menu Item", true, None), 2); .unwrap();
file_m
.insert(&MenuItem::new("New Menu Item", true, None), 2)
.unwrap();
} }
println!("{event:?}"); println!("{event:?}");
} }