starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-04-24 09:38:29 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Hide menu on windows/linux

Browse Source
This commit is contained in:
Gregory Schier
2023-11-21 08:17:37 -08:00
parent e98081b9f2
commit 0281396d58
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -5,7 +5,7 @@
"type": "module", "type": "module",
"scripts": { "scripts": {
"start": "npm run build:plugins && npm run tauri-dev", "start": "npm run build:plugins && npm run tauri-dev",
"tauri-dev": "YAAK_ENV=development tauri dev --no-watch --config src-tauri/tauri-dev.conf.json", "tauri-dev": "tauri dev --no-watch --config src-tauri/tauri-dev.conf.json",
"tauri-build": "tauri build", "tauri-build": "tauri build",
"tauri": "tauri", "tauri": "tauri",
"build": "npm run build:frontend", "build": "npm run build:frontend",

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

@@ -16,20 +16,20 @@ use fern::colors::ColoredLevelConfig;
use log::{debug, info, warn}; use log::{debug, info, warn};
use rand::random; use rand::random;
use serde::Serialize; use serde::Serialize;
use sqlx::{Pool, Sqlite, SqlitePool};
use sqlx::migrate::Migrator; use sqlx::migrate::Migrator;
use sqlx::types::Json; use sqlx::types::Json;
use tauri::{AppHandle, Menu, RunEvent, State, Submenu, Window, WindowUrl, Wry}; use sqlx::{Pool, Sqlite, SqlitePool};
use tauri::{CustomMenuItem, Manager, WindowEvent};
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
use tauri::TitleBarStyle; use tauri::TitleBarStyle;
use tauri::{AppHandle, Menu, RunEvent, State, Submenu, Window, WindowUrl, Wry};
use tauri::{CustomMenuItem, Manager, WindowEvent};
use tauri_plugin_log::{fern, LogTarget}; use tauri_plugin_log::{fern, LogTarget};
use tauri_plugin_window_state::{StateFlags, WindowExt}; use tauri_plugin_window_state::{StateFlags, WindowExt};
use tokio::sync::Mutex; use tokio::sync::Mutex;
use window_ext::TrafficLightWindowExt; use window_ext::TrafficLightWindowExt;
use crate::analytics::{AnalyticsAction, AnalyticsResource, track_event}; use crate::analytics::{track_event, AnalyticsAction, AnalyticsResource};
use crate::plugin::{ImportResources, ImportResult}; use crate::plugin::{ImportResources, ImportResult};
use crate::send::actually_send_request; use crate::send::actually_send_request;
use crate::updates::{update_mode_from_str, UpdateMode, YaakUpdater}; use crate::updates::{update_mode_from_str, UpdateMode, YaakUpdater};
@@ -665,7 +665,11 @@ fn main() {
create_dir_all(dir.clone()).expect("Problem creating App directory!"); create_dir_all(dir.clone()).expect("Problem creating App directory!");
let p = dir.join("db.sqlite"); let p = dir.join("db.sqlite");
File::options().write(true).create(true).open(&p).expect("Problem creating database file!"); File::options()
.write(true)
.create(true)
.open(&p)
.expect("Problem creating database file!");
let p_string = p.to_string_lossy().replace(' ', "%20"); let p_string = p.to_string_lossy().replace(' ', "%20");
let url = format!("sqlite://{}?mode=rwc", p_string); let url = format!("sqlite://{}?mode=rwc", p_string);
@@ -814,7 +818,6 @@ fn create_window(handle: &AppHandle<Wry>, url: Option<&str>) -> Window<Wry> {
window_id, window_id,
WindowUrl::App(url.unwrap_or_default().into()), WindowUrl::App(url.unwrap_or_default().into()),
) )
.menu(app_menu)
.fullscreen(false) .fullscreen(false)
.resizable(true) .resizable(true)
.inner_size(1100.0, 600.0) .inner_size(1100.0, 600.0)
@@ -829,6 +832,8 @@ fn create_window(handle: &AppHandle<Wry>, url: Option<&str>) -> Window<Wry> {
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
{ {
win_builder = win_builder win_builder = win_builder
.menu(app_menu)
.decorations(false)
.hidden_title(true) .hidden_title(true)
.title_bar_style(TitleBarStyle::Overlay); .title_bar_style(TitleBarStyle::Overlay);
} }
@@ -901,8 +906,7 @@ fn emit_side_effect<S: Serialize + Clone>(app_handle: &AppHandle<Wry>, event: &s
} }
async fn get_update_mode(pool: &Pool<Sqlite>) -> UpdateMode { async fn get_update_mode(pool: &Pool<Sqlite>) -> UpdateMode {
let mode = models::get_key_value_string("app", "update_mode", pool) let mode = models::get_key_value_string("app", "update_mode", pool).await;
.await;
match mode { match mode {
Some(mode) => update_mode_from_str(&mode), Some(mode) => update_mode_from_str(&mode),
None => UpdateMode::Stable, None => UpdateMode::Stable,