mirror of
https://github.com/mountain-loop/yaak.git
synced 2026-04-23 01:08:28 +02:00
Remove system tray icon
This commit is contained in:
@@ -22,7 +22,7 @@ use sqlx::types::Json;
|
|||||||
use sqlx::{Pool, Sqlite};
|
use sqlx::{Pool, Sqlite};
|
||||||
use tauri::regex::Regex;
|
use tauri::regex::Regex;
|
||||||
use tauri::{AppHandle, Menu, MenuItem, RunEvent, State, Submenu, TitleBarStyle, Window, Wry};
|
use tauri::{AppHandle, Menu, MenuItem, RunEvent, State, Submenu, TitleBarStyle, Window, Wry};
|
||||||
use tauri::{CustomMenuItem, Manager, SystemTray, SystemTrayEvent, SystemTrayMenu, WindowEvent};
|
use tauri::{CustomMenuItem, Manager, WindowEvent};
|
||||||
use tokio::sync::Mutex;
|
use tokio::sync::Mutex;
|
||||||
|
|
||||||
use window_ext::WindowExt;
|
use window_ext::WindowExt;
|
||||||
@@ -509,12 +509,7 @@ fn greet(name: &str) -> String {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
let quit = CustomMenuItem::new("quit".to_string(), "Quit");
|
|
||||||
let tray_menu = SystemTrayMenu::new().add_item(quit);
|
|
||||||
let system_tray = SystemTray::new().with_menu(tray_menu);
|
|
||||||
|
|
||||||
tauri::Builder::default()
|
tauri::Builder::default()
|
||||||
.system_tray(system_tray)
|
|
||||||
.setup(|app| {
|
.setup(|app| {
|
||||||
let dir = match is_dev() {
|
let dir = match is_dev() {
|
||||||
true => current_dir().unwrap(),
|
true => current_dir().unwrap(),
|
||||||
@@ -542,20 +537,6 @@ fn main() {
|
|||||||
Ok(())
|
Ok(())
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
.on_system_tray_event(|app, event| {
|
|
||||||
if let SystemTrayEvent::MenuItemClick { id, .. } = event {
|
|
||||||
match id.as_str() {
|
|
||||||
"quit" => {
|
|
||||||
std::process::exit(0);
|
|
||||||
}
|
|
||||||
"hide" => {
|
|
||||||
let window = app.get_window("main").unwrap();
|
|
||||||
window.hide().unwrap();
|
|
||||||
}
|
|
||||||
_ => {}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.invoke_handler(tauri::generate_handler![
|
.invoke_handler(tauri::generate_handler![
|
||||||
greet,
|
greet,
|
||||||
workspaces,
|
workspaces,
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
},
|
},
|
||||||
"package": {
|
"package": {
|
||||||
"productName": "Yaak",
|
"productName": "Yaak",
|
||||||
"version": "2023.0.12"
|
"version": "2023.0.13"
|
||||||
},
|
},
|
||||||
"tauri": {
|
"tauri": {
|
||||||
"windows": [],
|
"windows": [],
|
||||||
|
|||||||
@@ -119,13 +119,6 @@ export default function Workspace() {
|
|||||||
!isResizing && 'transition-all',
|
!isResizing && 'transition-all',
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<HeaderSize
|
|
||||||
data-tauri-drag-region
|
|
||||||
className="w-full bg-gray-50 border-b border-b-highlight text-gray-900"
|
|
||||||
style={head}
|
|
||||||
>
|
|
||||||
<WorkspaceHeader className="pointer-events-none" />
|
|
||||||
</HeaderSize>
|
|
||||||
{floating ? (
|
{floating ? (
|
||||||
<Overlay open={!hidden} portalName="sidebar" onClose={hide}>
|
<Overlay open={!hidden} portalName="sidebar" onClose={hide}>
|
||||||
<motion.div
|
<motion.div
|
||||||
@@ -162,6 +155,13 @@ export default function Workspace() {
|
|||||||
/>
|
/>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
<HeaderSize
|
||||||
|
data-tauri-drag-region
|
||||||
|
className="w-full bg-gray-50 border-b border-b-highlight text-gray-900"
|
||||||
|
style={head}
|
||||||
|
>
|
||||||
|
<WorkspaceHeader className="pointer-events-none" />
|
||||||
|
</HeaderSize>
|
||||||
<RequestResponse style={body} />
|
<RequestResponse style={body} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -39,7 +39,7 @@
|
|||||||
|
|
||||||
/* Style gutters */
|
/* Style gutters */
|
||||||
.cm-gutters {
|
.cm-gutters {
|
||||||
@apply border-0 text-gray-500/50 opacity-95;
|
@apply border-0 text-gray-500/50;
|
||||||
|
|
||||||
.cm-gutterElement {
|
.cm-gutterElement {
|
||||||
@apply cursor-default;
|
@apply cursor-default;
|
||||||
|
|||||||
Reference in New Issue
Block a user