CalvinBackup/tauri-plugins-workspace
1
0
Fork 0
mirror of https://github.com/tauri-apps/plugins-workspace.git synced 2026-07-04 15:47:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v2' into feat/cef

Browse Source
This commit is contained in:
Lucas Nogueira
2026-06-22 09:09:23 -03:00
parent 8049700614 41f6274270
commit 540d4e9648
26 changed files with 586 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/positioner/CHANGELOG.md
+4
View File
@@ -1,5 +1,9 @@
# Changelog
## \[2.3.2]
- [`c0d64bf7`](https://github.com/tauri-apps/plugins-workspace/commit/c0d64bf7d9c0f2c8ed1d2614745e15bbb3cde6a7) ([#3420](https://github.com/tauri-apps/plugins-workspace/pull/3420) by [@UrsDeSwardt](https://github.com/tauri-apps/plugins-workspace/../../UrsDeSwardt)) Removed panics and replaced them with error handling.
## \[2.3.1]
- [`93426f85`](https://github.com/tauri-apps/plugins-workspace/commit/93426f85120f49beb9f40222bff45185a32d54a9) Fixed an issue that caused docs.rs builds to fail. No user facing changes.
plugins/positioner/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-positioner"
version = "2.3.1"
version = "2.3.2"
description = "Position your windows at well-known locations."
authors = { workspace = true }
license = { workspace = true }
plugins/positioner/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-positioner",
"version": "2.3.1",
"version": "2.3.2",
"description": "Position your windows at well-known locations.",
"license": "MIT OR Apache-2.0",
"authors": [
plugins/positioner/src/ext.rs
+21 -7
View File
@@ -152,7 +152,9 @@ fn calculate_position<R: Runtime>(
) -> Result<PhysicalPosition<i32>> {
use Position::*;
let screen = window.current_monitor()?.unwrap();
let screen = window.current_monitor()?.ok_or_else(|| {
tauri::Error::Io(std::io::Error::other("No monitor found for the window"))
})?;
// Only use the screen_position for the Tray independent positioning,
// because a tray event may not be called on the currently active monitor.
let screen_position = screen.position();
@@ -225,7 +227,9 @@ fn calculate_position<R: Runtime>(
PhysicalPosition { x: tray_x, y }
} else {
panic!("Tray position not set");
return Err(tauri::Error::Io(std::io::Error::other(
"Tray position not set",
)));
}
}
#[cfg(feature = "tray-icon")]
@@ -236,7 +240,9 @@ fn calculate_position<R: Runtime>(
y: tray_y,
}
} else {
panic!("Tray position not set");
return Err(tauri::Error::Io(std::io::Error::other(
"Tray position not set",
)));
}
}
#[cfg(feature = "tray-icon")]
@@ -257,7 +263,9 @@ fn calculate_position<R: Runtime>(
y,
}
} else {
panic!("Tray position not set");
return Err(tauri::Error::Io(std::io::Error::other(
"Tray position not set",
)));
}
}
#[cfg(feature = "tray-icon")]
@@ -268,7 +276,9 @@ fn calculate_position<R: Runtime>(
y: tray_y,
}
} else {
panic!("Tray position not set");
return Err(tauri::Error::Io(std::io::Error::other(
"Tray position not set",
)));
}
}
#[cfg(feature = "tray-icon")]
@@ -287,7 +297,9 @@ fn calculate_position<R: Runtime>(
PhysicalPosition { x, y }
} else {
panic!("Tray position not set");
return Err(tauri::Error::Io(std::io::Error::other(
"Tray position not set",
)));
}
}
#[cfg(feature = "tray-icon")]
@@ -298,7 +310,9 @@ fn calculate_position<R: Runtime>(
y: tray_y,
}
} else {
panic!("Tray position not set");
return Err(tauri::Error::Io(std::io::Error::other(
"Tray position not set",
)));
}
}
};