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

Replace the internal WindowHandleAccess trait with a helper function on WindowInner

Browse source 
The reversal of ownership removes the need for the glue trait in the
publicly visible API.
This commit is contained in:
Simon Hausmann 2022-09-06 14:03:20 +02:00 • committed by Simon Hausmann
parent ea94089b05
commit 7967bf1ab0
25 changed files with 124 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

14
internal/compiler/generator/rust.rs
View file

@ -1118,7 +1118,7 @@ fn generate_item_tree(
),
Some(quote! {
_self.window_adapter.set(window_adapter);
_self.window_adapter.get().unwrap().window().window_handle().set_component(&VRc::into_dyn(self_rc.clone()));
slint::private_unstable_api::re_exports::WindowInner::from_pub(_self.window_adapter.get().unwrap().window()).set_component(&VRc::into_dyn(self_rc.clone()));
}),
)
} else {
@ -1234,12 +1234,6 @@ fn generate_item_tree(
}
}
impl slint::private_unstable_api::re_exports::WindowHandleAccess for #inner_component_id {
fn window_handle(&self) -> &slint::private_unstable_api::re_exports::WindowInner {
self.window_adapter.get().unwrap().window().window_handle()
}
}
impl slint::private_unstable_api::re_exports::Component for #inner_component_id {
fn visit_children_item(self: ::core::pin::Pin<&Self>, index: isize, order: slint::private_unstable_api::re_exports::TraversalOrder, visitor: slint::private_unstable_api::re_exports::ItemVisitorRefMut)
-> slint::private_unstable_api::re_exports::VisitChildrenResult
@ -2000,7 +1994,7 @@ fn compile_builtin_function_call(
let window_tokens = access_window_adapter_field(ctx);
let focus_item = access_item_rc(pr, ctx);
quote!(
#window_tokens.window().window_handle().set_focus_item(#focus_item);
slint::private_unstable_api::re_exports::WindowInner::from_pub(#window_tokens.window()).set_focus_item(#focus_item);
)
} else {
panic!("internal error: invalid args to SetFocusItem {:?}", arguments)
@ -2028,7 +2022,7 @@ fn compile_builtin_function_call(
let y = compile_expression(y, ctx);
let window_adapter_tokens = access_window_adapter_field(ctx);
quote!(
#window_adapter_tokens.window().window_handle().show_popup(
slint::private_unstable_api::re_exports::WindowInner::from_pub(#window_adapter_tokens.window()).show_popup(
&VRc::into_dyn(#popup_window_id::new(#component_access_tokens.self_weak.get().unwrap().clone()).into()),
Point::new(#x as slint::private_unstable_api::re_exports::Coord, #y as slint::private_unstable_api::re_exports::Coord),
#parent_component
@ -2079,7 +2073,7 @@ fn compile_builtin_function_call(
}
BuiltinFunction::GetWindowScaleFactor => {
let window_adapter_tokens = access_window_adapter_field(ctx);
quote!(#window_adapter_tokens.window().window_handle().scale_factor())
quote!(slint::private_unstable_api::re_exports::WindowInner::from_pub(#window_adapter_tokens.window()).scale_factor())
}
BuiltinFunction::AnimationTick => {
quote!(slint::private_unstable_api::re_exports::animation_tick())