language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-01 14:21:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

C++: Hide sixtyfps::PathData from the public API

Browse source
This commit is contained in:
Simon Hausmann 2021-06-21 14:26:52 +02:00 • committed by Simon Hausmann
parent 51bc21c9a5
commit fe59fb3ec3
2 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
api/sixtyfps-cpp/include/sixtyfps_pathdata.h
View file

@ -12,14 +12,14 @@ LICENSE END */
#include <string_view> #include <string_view>
#include "sixtyfps_pathdata_internal.h" #include "sixtyfps_pathdata_internal.h"
namespace sixtyfps { namespace sixtyfps::private_api {
using cbindgen_private::types::PathArcTo; using cbindgen_private::types::PathArcTo;
using cbindgen_private::types::PathCubicTo;
using cbindgen_private::types::PathElement; using cbindgen_private::types::PathElement;
using cbindgen_private::types::PathEvent; using cbindgen_private::types::PathEvent;
using cbindgen_private::types::PathLineTo; using cbindgen_private::types::PathLineTo;
using cbindgen_private::types::PathMoveTo; using cbindgen_private::types::PathMoveTo;
using cbindgen_private::types::PathCubicTo;
using cbindgen_private::types::PathQuadraticTo; using cbindgen_private::types::PathQuadraticTo;
using cbindgen_private::types::Point; using cbindgen_private::types::Point;
@ -40,7 +40,8 @@ public:
{ {
} }
friend bool operator==(const PathData &a, const PathData &b) { friend bool operator==(const PathData &a, const PathData &b)
{
if (a.data.tag != b.data.tag) if (a.data.tag != b.data.tag)
return false; return false;
switch (a.data.tag) { switch (a.data.tag) {
@ -51,12 +52,9 @@ public:
case cbindgen_private::types::PathData::Tag::None: case cbindgen_private::types::PathData::Tag::None:
return true; return true;
} }
return false; //unreachable return false; // unreachable
} }
friend bool operator!=(const PathData &a, const PathData &b) { friend bool operator!=(const PathData &a, const PathData &b) { return !(a == b); }
return !(a == b);
}
private: private:
static SharedVector<PathElement> elements_from_array(const PathElement *firstElement, static SharedVector<PathElement> elements_from_array(const PathElement *firstElement,

4
sixtyfps_compiler/generator/cpp.rs
View file

@ -2068,7 +2068,7 @@ fn compile_path(path: &crate::expression_tree::Path, component: &Rc<Component>)
sixtyfps::PathElement elements[{}] = {{ sixtyfps::PathElement elements[{}] = {{
{} {}
}}; }};
return sixtyfps::PathData(&elements[0], std::size(elements)); return sixtyfps::private_api::PathData(&elements[0], std::size(elements));
}}()"#, }}()"#,
converted_elements.len(), converted_elements.len(),
converted_elements.join(",") converted_elements.join(",")
@ -2084,7 +2084,7 @@ fn compile_path(path: &crate::expression_tree::Path, component: &Rc<Component>)
sixtyfps::Point coordinates[{}] = {{ sixtyfps::Point coordinates[{}] = {{
{} {}
}}; }};
return sixtyfps::PathData(&events[0], std::size(events), &coordinates[0], std::size(coordinates)); return sixtyfps::private_api::PathData(&events[0], std::size(events), &coordinates[0], std::size(coordinates));
}}()"#, }}()"#,
converted_events.len(), converted_events.len(),
converted_events.join(","), converted_events.join(","),