language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-09-27 12:29:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Avoid using cbindgen_private in generated C++ code

Browse source 
Instead, pull in the types manually.
This commit is contained in:
Simon Hausmann 2020-08-25 15:35:24 +02:00
parent 697aa61a0c
commit 9dd6101494
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/sixtyfps-cpp/include/sixtyfps.h
View file

@ -39,6 +39,7 @@ extern const cbindgen_private::ItemVTable WindowVTable;
// Bring opaque structure in scope // Bring opaque structure in scope
using cbindgen_private::ComponentVTable; using cbindgen_private::ComponentVTable;
using cbindgen_private::ItemVTable;
using ItemTreeNode = cbindgen_private::ItemTreeNode<uint8_t>; using ItemTreeNode = cbindgen_private::ItemTreeNode<uint8_t>;
using ComponentRef = VRef<ComponentVTable>; using ComponentRef = VRef<ComponentVTable>;
using ItemVisitorRefMut = VRefMut<cbindgen_private::ItemVisitorVTable>; using ItemVisitorRefMut = VRefMut<cbindgen_private::ItemVisitorVTable>;
@ -47,6 +48,7 @@ using cbindgen_private::EasingCurve;
using cbindgen_private::TextHorizontalAlignment; using cbindgen_private::TextHorizontalAlignment;
using cbindgen_private::TextVerticalAlignment; using cbindgen_private::TextVerticalAlignment;
using cbindgen_private::Slice; using cbindgen_private::Slice;
using cbindgen_private::PropertyAnimation;
struct ComponentWindow struct ComponentWindow
{ {

4
sixtyfps_compiler/generator/cpp.rs
View file

@ -251,7 +251,7 @@ fn property_animation_code(
) -> Option<String> { ) -> Option<String> {
if let Some(animation) = element.property_animations.get(property_name) { if let Some(animation) = element.property_animations.get(property_name) {
Some(new_struct_with_bindings( Some(new_struct_with_bindings(
"sixtyfps::cbindgen_private::PropertyAnimation", "sixtyfps::PropertyAnimation",
&animation.borrow().bindings, &animation.borrow().bindings,
component, component,
)) ))
@ -658,7 +658,7 @@ fn generate_component(
Access::Public, Access::Public,
Declaration::Function(Function { Declaration::Function(Function {
name: "root_item".into(), name: "root_item".into(),
signature: "() -> VRef<sixtyfps::cbindgen_private::ItemVTable>".into(), signature: "() -> VRef<sixtyfps::ItemVTable>".into(),
statements: Some(vec![format!( statements: Some(vec![format!(
"return {{ &sixtyfps::{vt}, &this->{id} }};", "return {{ &sixtyfps::{vt}, &this->{id} }};",
vt = root_elem.base_type.as_native().vtable_symbol, vt = root_elem.base_type.as_native().vtable_symbol,