language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-08-04 18:58:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

API cleanup: Rename PlatformWindow to WindowAdapter

Browse source
This commit is contained in:
Tobias Hunger 2022-08-29 12:17:41 +02:00 • committed by Tobias Hunger
parent 344f5c437b
commit 1e6ffeaa0f
50 changed files with 600 additions and 604 deletions
Download patch file Download diff file Expand all files Collapse all files

18
api/node/native/lib.rs
View file

@ -15,7 +15,7 @@ mod persistent_context;
struct WrappedComponentType(Option<slint_interpreter::ComponentDefinition>);
struct WrappedComponentRc(Option<slint_interpreter::ComponentInstance>);
struct WrappedWindow(Option<std::rc::Rc<dyn i_slint_core::window::PlatformWindow>>);
struct WrappedWindow(Option<std::rc::Rc<dyn i_slint_core::window::WindowAdapter>>);
/// We need to do some gymnastic with closures to pass the ExecuteContext with the right lifetime
type GlobalContextCallback<'c> =
@ -352,9 +352,9 @@ declare_types! {
let this = cx.this();
let component = cx.borrow(&this, |x| x.0.as_ref().map(|c| c.clone_strong()));
let component = component.ok_or(()).or_else(|()| cx.throw_error("Invalid type"))?;
let platform_window = component.window().window_handle().platform_window();
let window_adapter = component.window().window_handle().window_adapter();
let mut obj = SlintWindow::new::<_, JsValue, _>(&mut cx, std::iter::empty())?;
cx.borrow_mut(&mut obj, |mut obj| obj.0 = Some(platform_window));
cx.borrow_mut(&mut obj, |mut obj| obj.0 = Some(window_adapter));
Ok(obj.as_value(&mut cx))
}
method get_property(mut cx) {
@ -534,9 +534,9 @@ declare_types! {
method get_size(mut cx) {
let this = cx.this();
let platform_window = cx.borrow(&this, |x| x.0.as_ref().cloned());
let platform_window = platform_window.ok_or(()).or_else(|()| cx.throw_error("Invalid type"))?;
let size = platform_window.window().size();
let window_adapter = cx.borrow(&this, |x| x.0.as_ref().cloned());
let window_adapter = window_adapter.ok_or(()).or_else(|()| cx.throw_error("Invalid type"))?;
let size = window_adapter.window().size();
let size_object = JsObject::new(&mut cx);
let width_value = JsNumber::new(&mut cx, size.width).as_value(&mut cx);
@ -548,9 +548,9 @@ declare_types! {
method set_size(mut cx) {
let this = cx.this();
let platform_window = cx.borrow(&this, |x| x.0.as_ref().cloned());
let platform_window = platform_window.ok_or(()).or_else(|()| cx.throw_error("Invalid type"))?;
let window = platform_window.window();
let window_adapter = cx.borrow(&this, |x| x.0.as_ref().cloned());
let window_adapter = window_adapter.ok_or(()).or_else(|()| cx.throw_error("Invalid type"))?;
let window = window_adapter.window();
let size_object = cx.argument::<JsObject>(0)?;
let width = size_object.get(&mut cx, "width")?.downcast_or_throw::<JsNumber, _>(&mut cx)?.value();