MCorange/cinny-desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update action and disable menu

Browse Source
This commit is contained in:
Krishan
2026-01-20 11:41:19 +00:00
parent 943e569193
commit ae05d819eb
3 changed files with 55 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src-tauri/src/lib.rs
View File

@@ -3,44 +3,19 @@
windows_subsystem = "windows"
)]
// #[cfg(target_os = "macos")]
// mod menu;
// use tauri::{webview::WebviewWindowBuilder, WebviewUrl};
// fn main() {
// let port: u16 = 44548;
// let mut context = tauri::generate_context!();
// let url = format!("http://localhost:{}", port).parse().unwrap();
// let window_url = WebviewUrl::External(url);
// // context.config_mut().build.frontend_dist = WebviewWindowBuilder::Url(window_url.clone());
// // context.config_mut().build.dev_url = WebviewWindowBuilder::Url(window_url.clone());
// context.config_mut().build.frontend_dist = WebviewWindowBuilder::new(app, "Cinny", window_url.clone());
// context.config_mut().build.dev_url = WebviewWindowBuilder::new(app, "Cinny", window_url.clone());
// let builder = tauri::Builder::default();
// #[cfg(target_os = "macos")]
// let builder = builder.menu(menu::menu());
// builder
// .plugin(tauri_plugin_localhost::Builder::new(port).build())
// .plugin(tauri_plugin_window_state::Builder::default().build())
// .run(context)
// .expect("error while building tauri application")
// }
use tauri::{webview::WebviewWindowBuilder, WebviewUrl};
pub fn run() {
let port: u16 = 44548;
let context = tauri::generate_context!();
let builder = tauri::Builder::default();
#[cfg(target_os = "macos")]
let builder = builder.menu(menu::menu());
// #[cfg(target_os = "macos")]
// {
// builder = builder.menu(menu::menu());
// }
builder
.plugin(tauri_plugin_localhost::Builder::new(port).build())
@@ -48,14 +23,11 @@ pub fn run() {
.setup(move |app| {
let url = format!("http://localhost:{}", port).parse().unwrap();
let window_url = WebviewUrl::External(url);
WebviewWindowBuilder::new(app, "main".to_string(), window_url)
.title("Cinny")
.build()?;
Ok(())
})
.run(context)
.expect("error while running tauri application");
.expect("error while building tauri application");
}

79
src-tauri/src/menu.rs
View File

@@ -1,37 +1,44 @@
use tauri::{AboutMetadata, Menu, MenuItem, Submenu};
//for macOS
pub(crate) fn menu() -> Menu {
Menu::new()
.add_submenu(Submenu::new(
"Cinny",
Menu::new()
.add_native_item(MenuItem::About("Cinny".to_string(), AboutMetadata::new()))
.add_native_item(MenuItem::Separator)
.add_native_item(MenuItem::Hide)
.add_native_item(MenuItem::HideOthers)
.add_native_item(MenuItem::ShowAll)
.add_native_item(MenuItem::Separator)
.add_native_item(MenuItem::Quit),
))
.add_submenu(Submenu::new(
"Edit",
Menu::new()
.add_native_item(MenuItem::Undo)
.add_native_item(MenuItem::Redo)
.add_native_item(MenuItem::Separator)
.add_native_item(MenuItem::Cut)
.add_native_item(MenuItem::Copy)
.add_native_item(MenuItem::Paste)
.add_native_item(MenuItem::SelectAll),
))
.add_submenu(Submenu::new(
"View",
Menu::new().add_native_item(MenuItem::EnterFullScreen),
))
.add_submenu(Submenu::new(
"Window",
Menu::new()
.add_native_item(MenuItem::Minimize)
.add_native_item(MenuItem::Zoom),
))
use tauri::menu::{MenuBuilder, SubmenuBuilder};
use tauri::AppHandle;
pub fn menu() -> tauri::menu::Menu {
let app_menu = SubmenuBuilder::new(app, "Cinny")
.about(Some(Default::default()))
.separator()
.hide()
.hide_others()
.show_all()
.separator()
.quit()
.build()
.unwrap();
let edit_menu = SubmenuBuilder::new(app, "Edit")
.undo()
.redo()
.separator()
.cut()
.copy()
.paste()
.select_all()
.build()
.unwrap();
let view_menu = SubmenuBuilder::new(app, "View")
.fullscreen() // `.fullscreen()` works instead of `.enter_fullscreen()`
.build()
.unwrap();
let window_menu = SubmenuBuilder::new(app, "Window")
.minimize()
.build() // no `.zoom()` method directly available
.unwrap();
MenuBuilder::new(app)
.item(&app_menu)
.item(&edit_menu)
.item(&view_menu)
.item(&window_menu)
.build()
.unwrap()
}