From 830cd7eee802d6720af2d231b039c3127d8ebbfe Mon Sep 17 00:00:00 2001 From: Johannes Merkt Date: Fri, 24 Mar 2023 02:20:40 +0100 Subject: [PATCH] Set focus wip --- src-tauri/src/main.rs | 2 +- src-tauri/tauri.conf.json | 5 +++++ src/main.tsx | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index ee8c63b..b2c6a4d 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -25,7 +25,7 @@ fn main() { window.set_focus().ok(); window.request_user_attention(Some(tauri::UserAttentionType::Informational)).ok(); - println!("{}, {argv:?}, {cwd}", app.package_info().name); + //println!("{}, {argv:?}, {cwd}", app.package_info().name); app.emit_all("single-instance", Payload { args: argv, cwd }).unwrap(); })) diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index fe90bf3..12eb46e 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -35,6 +35,11 @@ }, "clipboard": { "writeText": true + }, + "window": { + "setFocus": true, + "show": true, + "requestUserAttention": true } }, "bundle": { diff --git a/src/main.tsx b/src/main.tsx index e864d46..550efb5 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -4,6 +4,8 @@ import { Providers } from "./Providers" import { Router } from "./Router" import { renderStreamerHTML } from "./streamer-overlay/renderStreamerOverlay" import events from "./mixpanel/mixpanel" +import { listen } from "@tauri-apps/api/event" +import { appWindow } from "@tauri-apps/api/window" events.init() @@ -27,6 +29,11 @@ renderStreamerHTML({ language_code: "", }) +listen("single-instance", () => { + //appWindow.requestUserAttention(2) + //appWindow.setFocus() +}) + ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(