language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-08-31 07:37:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove the use of the PlatformWindowRc alias again

Browse source 
and use Rc<dyn PlatformWindow> instead. The alias has to stay with the ffi
functions though and the item vtable definitions,
because we don't have an Rc<> template in C++.
This commit is contained in:
Simon Hausmann 2022-08-18 19:33:31 +02:00 • committed by Simon Hausmann
parent 74289deb25
commit 1d436778c1
36 changed files with 274 additions and 261 deletions
Download patch file Download diff file Expand all files Collapse all files

11
api/cpp/lib.rs
View file

@ -5,7 +5,8 @@
use core::ffi::c_void;
use i_slint_backend_selector::backend;
use i_slint_core::window::{ffi::PlatformWindowRcOpaque, PlatformWindowRc};
use i_slint_core::window::{ffi::PlatformWindowRcOpaque, PlatformWindow};
use std::rc::Rc;
#[doc(hidden)]
#[cold]
@ -19,10 +20,10 @@ pub fn use_modules() -> usize {
#[no_mangle]
pub unsafe extern "C" fn slint_windowrc_init(out: *mut PlatformWindowRcOpaque) {
assert_eq!(
core::mem::size_of::<PlatformWindowRc>(),
core::mem::size_of::<Rc<dyn PlatformWindow>>(),
core::mem::size_of::<PlatformWindowRcOpaque>()
);
core::ptr::write(out as *mut PlatformWindowRc, crate::backend().create_window());
core::ptr::write(out as *mut Rc<dyn PlatformWindow>, crate::backend().create_window());
}
#[no_mangle]
@ -69,7 +70,7 @@ pub unsafe extern "C" fn slint_register_font_from_path(
path: &i_slint_core::SharedString,
error_str: *mut i_slint_core::SharedString,
) {
let platform_window = &*(win as *const PlatformWindowRc);
let platform_window = &*(win as *const Rc<dyn PlatformWindow>);
core::ptr::write(
error_str,
match platform_window
@ -88,7 +89,7 @@ pub unsafe extern "C" fn slint_register_font_from_data(
data: i_slint_core::slice::Slice<'static, u8>,
error_str: *mut i_slint_core::SharedString,
) {
let platform_window = &*(win as *const PlatformWindowRc);
let platform_window = &*(win as *const Rc<dyn PlatformWindow>);
core::ptr::write(
error_str,
match platform_window.renderer().register_font_from_memory(data.as_slice()) {