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

Upgrade tauri to v2

Browse Source
This commit is contained in:
Krishan
2025-09-07 13:11:25 +00:00
parent 9560e17823
commit 943e569193
15 changed files with 16970 additions and 1420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src-tauri/src/lib.rs Normal file
View File

@@ -0,0 +1,61 @@
#![cfg_attr(
all(not(debug_assertions), target_os = "windows"),
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());
builder
.plugin(tauri_plugin_localhost::Builder::new(port).build())
.plugin(tauri_plugin_window_state::Builder::default().build())
.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");
}

31
src-tauri/src/main.rs
View File

@@ -1,30 +1,5 @@
#![cfg_attr(
all(not(debug_assertions), target_os = "windows"),
windows_subsystem = "windows"
)]
#[cfg(target_os = "macos")]
mod menu;
use tauri::{utils::config::AppUrl, WindowUrl};
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
fn main() {
let port = 44548;
let mut context = tauri::generate_context!();
let url = format!("http://localhost:{}", port).parse().unwrap();
let window_url = WindowUrl::External(url);
// rewrite the config so the IPC is enabled on this URL
context.config_mut().build.dist_dir = AppUrl::Url(window_url.clone());
context.config_mut().build.dev_path = AppUrl::Url(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")
}
app_lib::run();
}

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

@@ -5,10 +5,7 @@ pub(crate) fn menu() -> Menu {
.add_submenu(Submenu::new(
"Cinny",
Menu::new()
.add_native_item(MenuItem::About(
"Cinny".to_string(),
AboutMetadata::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)
@@ -29,8 +26,7 @@ pub(crate) fn menu() -> Menu {
))
.add_submenu(Submenu::new(
"View",
Menu::new()
.add_native_item(MenuItem::EnterFullScreen),
Menu::new().add_native_item(MenuItem::EnterFullScreen),
))
.add_submenu(Submenu::new(
"Window",
@@ -38,4 +34,4 @@ pub(crate) fn menu() -> Menu {
.add_native_item(MenuItem::Minimize)
.add_native_item(MenuItem::Zoom),
))
}
}