fix: macos dock display icon and text (#2818)

This commit is contained in:
Tunglies
2025-03-01 18:29:40 +08:00
committed by GitHub
parent 8fb66ea32c
commit 41c42bba32
4 changed files with 99 additions and 3 deletions

View File

@@ -1,7 +1,7 @@
use crate::config::IVerge;
use crate::utils::error;
use crate::{config::Config, config::PrfItem, core::*, utils::init, utils::server};
use crate::{log_err, wrap_err};
use crate::{log_err, wrap_err, AppHandleManager};
use anyhow::{bail, Result};
use once_cell::sync::OnceCell;
use percent_encoding::percent_decode_str;
@@ -37,7 +37,10 @@ pub fn find_unused_port() -> Result<u16> {
pub async fn resolve_setup(app: &mut App) {
error::redirect_panic_to_log();
#[cfg(target_os = "macos")]
app.set_activation_policy(tauri::ActivationPolicy::Accessory);
{
AppHandleManager::global().init(app.app_handle().clone());
AppHandleManager::global().set_activation_policy_accessory();
}
let version = app.package_info().version.to_string();
handle::Handle::global().init(app.app_handle());
@@ -130,6 +133,7 @@ pub fn create_window() {
log::info!(target: "app", "Starting to create window");
let app_handle = handle::Handle::global().app_handle().unwrap();
AppHandleManager::global().set_activation_policy_regular();
if let Some(window) = handle::Handle::global().get_window() {
println!("Found existing window, trying to show it");