tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2024-12-25 03:33:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat(core): expose run_on_main_thread API (#2711)

Browse Source
This commit is contained in:
Lucas Fernandes Nogueira 2021-10-04 12:54:38 -03:00 committed by GitHub
parent 7ed3f3b7e4
commit 53fdfe52bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/run-on-main-thread.md Normal file
View File

@ -0,0 +1,5 @@
---
"tauri": patch
---
Expose `run_on_main_thread` APIs on `Window` and `AppHandle`.

6
.changes/runtime-handle-run-on-main-thread.md Normal file
View File

@ -0,0 +1,6 @@
---
"tauri-runtime": "patch"
"tauri-runtime-wry": patch
---
Added `run_on_main_thread` API on `RuntimeHandle`.

4
core/tauri-runtime-wry/src/lib.rs
View File

@ -1528,6 +1528,10 @@ impl RuntimeHandle for WryHandle {
Ok(DetachedWindow { label, dispatcher })
}
fn run_on_main_thread<F: FnOnce() + Send + 'static>(&self, f: F) -> Result<()> {
send_user_message(&self.context, Message::Task(Box::new(f)))
}
#[cfg(all(windows, feature = "system-tray"))]
/// Deprecated. (not needed anymore)
fn remove_system_tray(&self) -> Result<()> {

3
core/tauri-runtime/src/lib.rs
View File

@ -255,6 +255,9 @@ pub trait RuntimeHandle: Debug + Send + Sized + Clone + 'static {
pending: PendingWindow<Self::Runtime>,
) -> crate::Result<DetachedWindow<Self::Runtime>>;
/// Run a task on the main thread.
fn run_on_main_thread<F: FnOnce() + Send + 'static>(&self, f: F) -> crate::Result<()>;
#[cfg(all(windows, feature = "system-tray"))]
#[cfg_attr(doc_cfg, doc(cfg(all(windows, feature = "system-tray"))))]
fn remove_system_tray(&self) -> crate::Result<()>;

9
core/tauri/src/app.rs
View File

@ -33,7 +33,6 @@ use std::{
use crate::runtime::menu::{Menu, MenuId, MenuIdRef};
#[cfg(all(windows, feature = "system-tray"))]
use crate::runtime::RuntimeHandle;
#[cfg(feature = "system-tray")]
use crate::runtime::{Icon, SystemTrayEvent as RuntimeSystemTrayEvent};
@ -225,6 +224,14 @@ impl<'de, R: Runtime> CommandArg<'de, R> for AppHandle<R> {
}
impl<R: Runtime> AppHandle<R> {
/// Runs the given closure on the main thread.
pub fn run_on_main_thread<F: FnOnce() + Send + 'static>(&self, f: F) -> crate::Result<()> {
self
.runtime_handle
.run_on_main_thread(f)
.map_err(Into::into)
}
/// Removes the system tray.
#[cfg(all(windows, feature = "system-tray"))]
#[cfg_attr(doc_cfg, doc(cfg(all(windows, feature = "system-tray"))))]

4
core/tauri/src/window.rs
View File

@ -206,8 +206,8 @@ impl<R: Runtime> Window<R> {
self.window.dispatcher.clone()
}
#[allow(dead_code)]
pub(crate) fn run_on_main_thread<F: FnOnce() + Send + 'static>(&self, f: F) -> crate::Result<()> {
/// Runs the given closure on the main thread.
pub fn run_on_main_thread<F: FnOnce() + Send + 'static>(&self, f: F) -> crate::Result<()> {
self
.window
.dispatcher