Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-27 23:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

[OH] Provide correct geometry offset and fix available screen dimensions (#36915)

Browse source 
This commit corrects the geometry details provided under the OH platform
by getting the offset from the OS. OH port provides correct offset and
available space.

Fixes: #36466

---------

Signed-off-by: Astraea Quinn Skoutelli <astraea.quinn.skoutelli@huawei.com>
Signed-off-by: Jonathan Schwender <55576758+jschwe@users.noreply.github.com>
Co-authored-by: Jonathan Schwender <55576758+jschwe@users.noreply.github.com>
This commit is contained in:
Astraea Quinn S 2025-05-09 17:07:49 +02:00 • committed by GitHub
parent 2aaf9695df
commit 366515f256
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 47 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

32
ports/servoshell/egl/ohos.rs
View file

@ -28,8 +28,9 @@ use servo::{
use xcomponent_sys::{
OH_NativeXComponent, OH_NativeXComponent_Callback, OH_NativeXComponent_GetKeyEvent,
OH_NativeXComponent_GetKeyEventAction, OH_NativeXComponent_GetKeyEventCode,
OH_NativeXComponent_GetTouchEvent, OH_NativeXComponent_GetXComponentSize,
OH_NativeXComponent_KeyAction, OH_NativeXComponent_KeyCode, OH_NativeXComponent_KeyEvent,
OH_NativeXComponent_GetTouchEvent, OH_NativeXComponent_GetXComponentOffset,
OH_NativeXComponent_GetXComponentSize, OH_NativeXComponent_KeyAction,
OH_NativeXComponent_KeyCode, OH_NativeXComponent_KeyEvent,
OH_NativeXComponent_RegisterCallback, OH_NativeXComponent_RegisterKeyEventCallback,
OH_NativeXComponent_TouchEvent, OH_NativeXComponent_TouchEventType,
};
@ -267,6 +268,33 @@ extern "C" fn on_surface_created_cb(xcomponent: *mut OH_NativeXComponent, window
info!("Returning from on_surface_created_cb");
}
/// Returns the offset of the surface relative to its parent's top left corner
///
/// # Safety
///
/// `xcomponent` and `native_window` must be valid, non-null and aligned pointers to a
/// live xcomponent and associated native window surface.
unsafe fn get_xcomponent_offset(
xcomponent: *mut OH_NativeXComponent,
native_window: *mut c_void,
) -> Result<(i32, i32), i32> {
let mut x: f64 = 0.0;
let mut y: f64 = 0.0;
let result = unsafe {
OH_NativeXComponent_GetXComponentOffset(xcomponent, native_window, &raw mut x, &raw mut y)
};
if result != 0 {
error!("OH_NativeXComponent_GetXComponentOffset failed with {result}");
return Err(result);
}
Ok((
(x.round() as i64).try_into().expect("X offset too large"),
(y.round() as i64).try_into().expect("Y offset too large"),
))
}
/// Returns the size of the surface
///
/// # Safety