优化mac打包模式,buid.sh一键打包脚本兼容MacOS
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Categories=Office
|
||||
Exec=com-tw93-weread
|
||||
Icon=com-tw93-weread
|
||||
Name=com-tw93-weread
|
||||
Exec=weread
|
||||
Icon=weread
|
||||
Name=weread
|
||||
Name[zh_CN]=微信阅读
|
||||
StartupNotify=true
|
||||
Terminal=false
|
||||
@@ -2,6 +2,10 @@
|
||||
#![windows_subsystem = "windows"]
|
||||
extern crate image;
|
||||
use tauri_utils::config::{Config, WindowConfig};
|
||||
#[cfg(target_os = "macos")]
|
||||
use wry::application::platform::macos::WindowBuilderExtMacOS;
|
||||
#[cfg(target_os = "windows")]
|
||||
use wry::application::platform::windows::WindowBuilderExtWindows;
|
||||
|
||||
#[cfg(target_os="macos")]
|
||||
use wry::{
|
||||
@@ -46,18 +50,30 @@ fn main() -> wry::Result<()> {
|
||||
#[cfg(target_os = "macos")]
|
||||
let mut menu_bar_menu = Menu::new();
|
||||
#[cfg(target_os = "macos")]
|
||||
let mut first_menu = Menu::new()
|
||||
.add_native_item(MenuItem::Hide)
|
||||
.add_native_item(MenuItem::EnterFullScreen)
|
||||
.add_native_item(MenuItem::Minimize)
|
||||
.add_native_item(MenuItem::Separator)
|
||||
.add_native_item(MenuItem::Copy)
|
||||
.add_native_item(MenuItem::Cut)
|
||||
.add_native_item(MenuItem::Paste)
|
||||
.add_native_item(MenuItem::Undo)
|
||||
.add_native_item(MenuItem::Redo)
|
||||
.add_native_item(MenuItem::SelectAll)
|
||||
.add_native_item(MenuItem::Separator);
|
||||
let mut first_menu = Menu::new();
|
||||
#[cfg(target_os = "macos")]
|
||||
first_menu.add_native_item(MenuItem::Hide);
|
||||
#[cfg(target_os = "macos")]
|
||||
first_menu.add_native_item(MenuItem::EnterFullScreen);
|
||||
#[cfg(target_os = "macos")]
|
||||
first_menu.add_native_item(MenuItem::Minimize);
|
||||
#[cfg(target_os = "macos")]
|
||||
first_menu.add_native_item(MenuItem::Separator);
|
||||
#[cfg(target_os = "macos")]
|
||||
first_menu.add_native_item(MenuItem::Copy);
|
||||
#[cfg(target_os = "macos")]
|
||||
first_menu.add_native_item(MenuItem::Cut);
|
||||
#[cfg(target_os = "macos")]
|
||||
first_menu.add_native_item(MenuItem::Paste);
|
||||
#[cfg(target_os = "macos")]
|
||||
first_menu.add_native_item(MenuItem::Undo);
|
||||
#[cfg(target_os = "macos")]
|
||||
first_menu.add_native_item(MenuItem::Redo);
|
||||
#[cfg(target_os = "macos")]
|
||||
first_menu.add_native_item(MenuItem::SelectAll);
|
||||
#[cfg(target_os = "macos")]
|
||||
first_menu.add_native_item(MenuItem::Separator);
|
||||
|
||||
#[cfg(target_os = "macos")]
|
||||
let close_item = first_menu.add_item(
|
||||
MenuItemAttributes::new("CloseWindow")
|
||||
@@ -69,7 +85,7 @@ fn main() -> wry::Result<()> {
|
||||
|
||||
#[cfg(target_os = "macos")]
|
||||
menu_bar_menu.add_submenu("App", true, first_menu);
|
||||
|
||||
#[cfg(target_os = "linux")]
|
||||
let WindowConfig {
|
||||
url,
|
||||
width,
|
||||
@@ -78,6 +94,25 @@ fn main() -> wry::Result<()> {
|
||||
fullscreen,
|
||||
..
|
||||
} = get_windows_config().unwrap_or(WindowConfig::default());
|
||||
#[cfg(target_os = "windows")]
|
||||
let WindowConfig {
|
||||
url,
|
||||
width,
|
||||
height,
|
||||
resizable,
|
||||
fullscreen,
|
||||
..
|
||||
} = get_windows_config().unwrap_or(WindowConfig::default());
|
||||
#[cfg(target_os = "macos")]
|
||||
let WindowConfig {
|
||||
url,
|
||||
width,
|
||||
height,
|
||||
resizable,
|
||||
transparent,
|
||||
fullscreen,
|
||||
..
|
||||
} = get_windows_config().unwrap_or(WindowConfig::default());
|
||||
let event_loop = EventLoop::new();
|
||||
|
||||
let common_window = WindowBuilder::new()
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"package": {
|
||||
"productName": "com.tw93.weread",
|
||||
"productName": "weread",
|
||||
"version": "0.2.0"
|
||||
},
|
||||
"tauri": {
|
||||
@@ -39,7 +39,7 @@
|
||||
"librsvg2-dev"
|
||||
],
|
||||
"files": {
|
||||
"/usr/share/applications/com-tw93-weread.desktop": "assets/com-tw93-weread.desktop"
|
||||
"/usr/share/applications/weread.desktop": "assets/weread.desktop"
|
||||
}
|
||||
},
|
||||
"externalBin": [],
|
||||
|
||||
Reference in New Issue
Block a user