diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index fd637ae0..4bb6cc22 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -22,7 +22,7 @@ use sqlx::types::Json; use sqlx::{Pool, Sqlite}; use tauri::regex::Regex; 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 window_ext::WindowExt; @@ -509,12 +509,7 @@ fn greet(name: &str) -> String { } 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() - .system_tray(system_tray) .setup(|app| { let dir = match is_dev() { true => current_dir().unwrap(), @@ -542,20 +537,6 @@ fn main() { 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![ greet, workspaces, diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 074f1693..7251ee09 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "Yaak", - "version": "2023.0.12" + "version": "2023.0.13" }, "tauri": { "windows": [], diff --git a/src-web/components/Workspace.tsx b/src-web/components/Workspace.tsx index 270fe6cf..d98b5619 100644 --- a/src-web/components/Workspace.tsx +++ b/src-web/components/Workspace.tsx @@ -119,13 +119,6 @@ export default function Workspace() { !isResizing && 'transition-all', )} > - - - {floating ? ( )} + + + ); diff --git a/src-web/components/core/Editor/Editor.css b/src-web/components/core/Editor/Editor.css index 7d788f82..3fdba064 100644 --- a/src-web/components/core/Editor/Editor.css +++ b/src-web/components/core/Editor/Editor.css @@ -39,7 +39,7 @@ /* Style gutters */ .cm-gutters { - @apply border-0 text-gray-500/50 opacity-95; + @apply border-0 text-gray-500/50; .cm-gutterElement { @apply cursor-default;