language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-11-01 04:18:14 +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

24
api/cpp/lib.rs
View file

@ -4,7 +4,7 @@
/*! This crate just expose the function used by the C++ integration */
use core::ffi::c_void;
use i_slint_core::window::{ffi::PlatformWindowRcOpaque, PlatformWindow};
use i_slint_core::window::{ffi::WindowAdapterRcOpaque, WindowAdapter};
use std::rc::Rc;
#[doc(hidden)]
@ -17,13 +17,13 @@ pub fn use_modules() -> usize {
}
#[no_mangle]
pub unsafe extern "C" fn slint_windowrc_init(out: *mut PlatformWindowRcOpaque) {
pub unsafe extern "C" fn slint_windowrc_init(out: *mut WindowAdapterRcOpaque) {
assert_eq!(
core::mem::size_of::<Rc<dyn PlatformWindow>>(),
core::mem::size_of::<PlatformWindowRcOpaque>()
core::mem::size_of::<Rc<dyn WindowAdapter>>(),
core::mem::size_of::<WindowAdapterRcOpaque>()
);
let win = i_slint_backend_selector::with_platform_abstraction(|b| b.create_window());
core::ptr::write(out as *mut Rc<dyn PlatformWindow>, win);
core::ptr::write(out as *mut Rc<dyn WindowAdapter>, win);
}
#[no_mangle]
@ -67,16 +67,14 @@ pub unsafe extern "C" fn slint_quit_event_loop() {
#[no_mangle]
pub unsafe extern "C" fn slint_register_font_from_path(
win: *const PlatformWindowRcOpaque,
win: *const WindowAdapterRcOpaque,
path: &i_slint_core::SharedString,
error_str: *mut i_slint_core::SharedString,
) {
let platform_window = &*(win as *const Rc<dyn PlatformWindow>);
let window_adapter = &*(win as *const Rc<dyn WindowAdapter>);
core::ptr::write(
error_str,
match platform_window
.renderer()
.register_font_from_path(std::path::Path::new(path.as_str()))
match window_adapter.renderer().register_font_from_path(std::path::Path::new(path.as_str()))
{
Ok(()) => Default::default(),
Err(err) => err.to_string().into(),
@ -86,14 +84,14 @@ pub unsafe extern "C" fn slint_register_font_from_path(
#[no_mangle]
pub unsafe extern "C" fn slint_register_font_from_data(
win: *const PlatformWindowRcOpaque,
win: *const WindowAdapterRcOpaque,
data: i_slint_core::slice::Slice<'static, u8>,
error_str: *mut i_slint_core::SharedString,
) {
let platform_window = &*(win as *const Rc<dyn PlatformWindow>);
let window_adapter = &*(win as *const Rc<dyn WindowAdapter>);
core::ptr::write(
error_str,
match platform_window.renderer().register_font_from_memory(data.as_slice()) {
match window_adapter.renderer().register_font_from_memory(data.as_slice()) {
Ok(()) => Default::default(),
Err(err) => err.to_string().into(),
},