diff --git a/crates/tauri/src/main.rs b/crates/tauri/src/main.rs index 93fe54002..221fd03fb 100644 --- a/crates/tauri/src/main.rs +++ b/crates/tauri/src/main.rs @@ -2,8 +2,6 @@ all(not(debug_assertions), target_os = "windows"), windows_subsystem = "windows" )] -#[allow(unused_imports)] -use std::borrow::Cow; use std::collections::HashMap; use std::io; use std::path::PathBuf; @@ -76,7 +74,9 @@ fn main() -> Result<(), Box> { Some(sentry::init(( "https://13d7d51a8293459abd0aba88f99f4c18@o1334159.ingest.sentry.io/6600471", sentry::ClientOptions { - release: Some(Cow::from(ctx.package_info().version.to_string())), + release: Some(std::borrow::Cow::from( + ctx.package_info().version.to_string(), + )), traces_sample_rate: 0.1, ..Default::default() }, diff --git a/crates/tauri/src/platform/mac.rs b/crates/tauri/src/platform/mac.rs index c91b9318d..c32901aaa 100644 --- a/crates/tauri/src/platform/mac.rs +++ b/crates/tauri/src/platform/mac.rs @@ -1,18 +1,17 @@ use shared::event::ClientEvent; -use tauri::Window; +use tauri::{Manager, Window}; use url::Url; use crate::window; pub fn show_search_bar(window: &Window) { - let _ = window.show(); + let _ = tauri::AppHandle::show(&window.app_handle()); window::center_search_bar(window); - let _ = window.set_always_on_top(true); let _ = window.set_focus(); } pub fn hide_search_bar(window: &Window) { - let _ = window.hide(); + let _ = tauri::AppHandle::hide(&window.app_handle()); let _ = window.emit(ClientEvent::ClearSearch.as_ref(), true); } diff --git a/crates/tauri/src/plugins/startup.rs b/crates/tauri/src/plugins/startup.rs index 002db24f7..7e75f2901 100644 --- a/crates/tauri/src/plugins/startup.rs +++ b/crates/tauri/src/plugins/startup.rs @@ -8,8 +8,8 @@ use tokio::sync::{broadcast, Mutex}; use migration::Migrator; use shared::config::Config; -use crate::rpc::SpyglassServerClient; use crate::window::show_wizard_window; +use crate::{rpc::SpyglassServerClient, window::get_searchbar}; use crate::{rpc::RpcMutex, window, AppEvent}; pub struct StartupProgressText(std::sync::Mutex); @@ -117,5 +117,8 @@ async fn run_and_check_backend(app_handle: AppHandle) { // Run wizard on first run if !config.user_settings.run_wizard { show_wizard_window(&window.app_handle()); + } else { + let sbar = get_searchbar(&app_handle); + let _ = sbar.show(); } }