Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add cursor_position getter #9297

Merged
merged 11 commits into from
Apr 29, 2024
Merged

feat: add cursor_position getter #9297

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5560515
feat: add `cursor_position` getter
amrbashir Mar 29, 2024
0ef07ba
js api
amrbashir Mar 29, 2024
e758401
Update mod.rs
amrbashir Mar 29, 2024
747db27
fix build on iOS and android
amrbashir Apr 1, 2024
2096d32
use existing wrapper
lucasfernog Apr 1, 2024
b0f8807
merge from dev
lucasfernog Apr 1, 2024
ebc64ea
fmt
lucasfernog Apr 1, 2024
898dd00
adjust wording
amrbashir Apr 1, 2024
a6dd687
Merge branch 'dev' into feat/cursor-position
amrbashir Apr 1, 2024
320b88f
Merge branch 'dev' into feat/cursor-position
amrbashir Apr 29, 2024
e7aee8d
update docs
amrbashir Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 15 additions & 11 deletions core/tauri/src/webview/webview_window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1152,17 +1152,6 @@ impl<R: Runtime> WebviewWindow<R> {
self.webview.window().available_monitors()
}

/// Get the cursor position relative to the top-left hand corner of the desktop.
///
/// Note that the top-left hand corner of the desktop is not necessarily the same as the screen.
/// If the user uses a desktop with multiple monitors,
/// the top-left hand corner of the desktop is the top-left hand corner of the monitor at the top-left of the desktop.
///
/// The coordinates can be negative if the top-left hand corner of the window is outside of the visible screen region.
pub fn cursor_position(&self) -> crate::Result<PhysicalPosition<f64>> {
self.webview.cursor_position()
}

/// Returns the native handle that is used by this window.
#[cfg(target_os = "macos")]
pub fn ns_window(&self) -> crate::Result<*mut std::ffi::c_void> {
Expand Down Expand Up @@ -1219,6 +1208,21 @@ impl<R: Runtime> WebviewWindow<R> {
}
}

/// Desktop window getters.
#[cfg(desktop)]
impl<R: Runtime> WebviewWindow<R> {
/// Get the cursor position relative to the top-left hand corner of the desktop.
///
/// Note that the top-left hand corner of the desktop is not necessarily the same as the screen.
/// If the user uses a desktop with multiple monitors,
/// the top-left hand corner of the desktop is the top-left hand corner of the monitor at the top-left of the desktop.
///
/// The coordinates can be negative if the top-left hand corner of the window is outside of the visible screen region.
FabianLars marked this conversation as resolved.
Show resolved Hide resolved
pub fn cursor_position(&self) -> crate::Result<PhysicalPosition<f64>> {
self.webview.cursor_position()
}
}

/// Desktop window setters and actions.
#[cfg(desktop)]
impl<R: Runtime> WebviewWindow<R> {
Expand Down
26 changes: 15 additions & 11 deletions core/tauri/src/window/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1445,17 +1445,6 @@ impl<R: Runtime> Window<R> {
.map_err(Into::into)
}

/// Get the cursor position relative to the top-left hand corner of the desktop.
///
/// Note that the top-left hand corner of the desktop is not necessarily the same as the screen.
/// If the user uses a desktop with multiple monitors,
/// the top-left hand corner of the desktop is the top-left hand corner of the monitor at the top-left of the desktop.
///
/// The coordinates can be negative if the top-left hand corner of the window is outside of the visible screen region.
pub fn cursor_position(&self) -> crate::Result<PhysicalPosition<f64>> {
self.app_handle.cursor_position()
}

/// Returns the native handle that is used by this window.
#[cfg(target_os = "macos")]
pub fn ns_window(&self) -> crate::Result<*mut std::ffi::c_void> {
Expand Down Expand Up @@ -1550,6 +1539,21 @@ impl<R: Runtime> Window<R> {
}
}

/// Desktop window getters.
#[cfg(desktop)]
impl<R: Runtime> Window<R> {
/// Get the cursor position relative to the top-left hand corner of the desktop.
///
/// Note that the top-left hand corner of the desktop is not necessarily the same as the screen.
/// If the user uses a desktop with multiple monitors,
/// the top-left hand corner of the desktop is the top-left hand corner of the monitor at the top-left of the desktop.
///
/// The coordinates can be negative if the top-left hand corner of the window is outside of the visible screen region.
pub fn cursor_position(&self) -> crate::Result<PhysicalPosition<f64>> {
self.app_handle.cursor_position()
}
}

/// Desktop window setters and actions.
#[cfg(desktop)]
impl<R: Runtime> Window<R> {
Expand Down