DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

clang-format the JS directory

Browse Source
This commit is contained in:
Nick Gerleman
2022-12-22 03:59:36 -08:00
parent a948c485f8
commit 09f0869262
6 changed files with 133 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/clang-format/action.yml vendored
View File

@@ -21,4 +21,4 @@ runs:
run: | run: |
shopt -s globstar shopt -s globstar
shopt -s nullglob shopt -s nullglob
clang-format-${{ inputs.version }} --dry-run --Werror **/*.cpp **/*.h **/*.m **/*.mm clang-format-${{ inputs.version }} --dry-run --Werror **/*.cpp **/*.cc **/*.h **/*.hh **/*.m **/*.mm

5
.github/workflows/validate-cpp.yml vendored
View File

@@ -19,3 +19,8 @@ jobs:
uses: ./.github/actions/clang-format uses: ./.github/actions/clang-format
with: with:
directory: ./yoga directory: ./yoga
- name: clang-format (JavaScript Bindings)
uses: ./.github/actions/clang-format
with:
directory: ./javascript

4
javascript/sources/Node.cc
View File

@@ -369,7 +369,7 @@ Node* Node::getChild(unsigned index) {
return Node::fromYGNode(nodePtr); return Node::fromYGNode(nodePtr);
} }
void Node::setMeasureFunc(MeasureCallback *measureFunc) { void Node::setMeasureFunc(MeasureCallback* measureFunc) {
m_measureFunc.reset(measureFunc); m_measureFunc.reset(measureFunc);
YGNodeSetMeasureFunc(m_node, &globalMeasureFunc); YGNodeSetMeasureFunc(m_node, &globalMeasureFunc);
@@ -389,7 +389,7 @@ Size Node::callMeasureFunc(
return m_measureFunc->measure(width, widthMode, height, heightMode); return m_measureFunc->measure(width, widthMode, height, heightMode);
} }
void Node::setDirtiedFunc(DirtiedCallback *dirtiedFunc) { void Node::setDirtiedFunc(DirtiedCallback* dirtiedFunc) {
m_dirtiedFunc.reset(dirtiedFunc); m_dirtiedFunc.reset(dirtiedFunc);
YGNodeSetDirtiedFunc(m_node, &globalDirtiedFunc); YGNodeSetDirtiedFunc(m_node, &globalDirtiedFunc);

15
javascript/sources/Node.hh
View File

@@ -20,7 +20,8 @@
class MeasureCallback { class MeasureCallback {
public: public:
virtual ~MeasureCallback() {} virtual ~MeasureCallback() {}
virtual Size measure(float width, virtual Size measure(
float width,
int widthMode, int widthMode,
float height, float height,
int heightMode) = 0; int heightMode) = 0;
@@ -29,8 +30,7 @@ public:
class MeasureCallbackWrapper : public emscripten::wrapper<MeasureCallback> { class MeasureCallbackWrapper : public emscripten::wrapper<MeasureCallback> {
public: public:
EMSCRIPTEN_WRAPPER(MeasureCallbackWrapper); EMSCRIPTEN_WRAPPER(MeasureCallbackWrapper);
Size measure(float width, int widthMode, float height, int heightMode) Size measure(float width, int widthMode, float height, int heightMode) {
{
return call<Size>("measure", width, widthMode, height, heightMode); return call<Size>("measure", width, widthMode, height, heightMode);
} }
}; };
@@ -44,10 +44,7 @@ public:
class DirtiedCallbackWrapper : public emscripten::wrapper<DirtiedCallback> { class DirtiedCallbackWrapper : public emscripten::wrapper<DirtiedCallback> {
public: public:
EMSCRIPTEN_WRAPPER(DirtiedCallbackWrapper); EMSCRIPTEN_WRAPPER(DirtiedCallbackWrapper);
void dirtied() void dirtied() { return call<void>("dirtied"); }
{
return call<void>("dirtied");
}
}; };
class Node { class Node {
@@ -180,7 +177,7 @@ public: // Tree hierarchy inspectors
Node* getChild(unsigned index); Node* getChild(unsigned index);
public: // Measure func mutators public: // Measure func mutators
void setMeasureFunc(MeasureCallback *measureFunc); void setMeasureFunc(MeasureCallback* measureFunc);
void unsetMeasureFunc(void); void unsetMeasureFunc(void);
public: // Measure func inspectors public: // Measure func inspectors
@@ -191,7 +188,7 @@ public: // Measure func inspectors
int heightMode) const; int heightMode) const;
public: // Dirtied func mutators public: // Dirtied func mutators
void setDirtiedFunc(DirtiedCallback *dirtiedFunc); void setDirtiedFunc(DirtiedCallback* dirtiedFunc);
void unsetDirtiedFunc(void); void unsetDirtiedFunc(void);
public: // Dirtied func inspectors public: // Dirtied func inspectors

237
javascript/sources/embind.cc
View File

@@ -18,171 +18,170 @@ using namespace emscripten;
EMSCRIPTEN_BINDINGS(YOGA_LAYOUT) { EMSCRIPTEN_BINDINGS(YOGA_LAYOUT) {
class_<MeasureCallback>("MeasureCallback") class_<MeasureCallback>("MeasureCallback")
.function("measure", &MeasureCallback::measure, pure_virtual()) .function("measure", &MeasureCallback::measure, pure_virtual())
.allow_subclass<MeasureCallbackWrapper>("MeasureCallbackWrapper") .allow_subclass<MeasureCallbackWrapper>("MeasureCallbackWrapper");
;
class_<DirtiedCallback>("DirtiedCallback") class_<DirtiedCallback>("DirtiedCallback")
.function("dirtied", &DirtiedCallback::dirtied, pure_virtual()) .function("dirtied", &DirtiedCallback::dirtied, pure_virtual())
.allow_subclass<DirtiedCallbackWrapper>("DirtiedCallbackWrapper") .allow_subclass<DirtiedCallbackWrapper>("DirtiedCallbackWrapper");
;
class_<Config>("Config") class_<Config>("Config")
.constructor<>(&Config::create, allow_raw_pointers()) .constructor<>(&Config::create, allow_raw_pointers())
.class_function<>("create", &Config::create, allow_raw_pointers()) .class_function<>("create", &Config::create, allow_raw_pointers())
.class_function<>("destroy", &Config::destroy, allow_raw_pointers()) .class_function<>("destroy", &Config::destroy, allow_raw_pointers())
.function("setExperimentalFeatureEnabled", &Config::setExperimentalFeatureEnabled) .function(
.function("setPointScaleFactor", &Config::setPointScaleFactor) "setExperimentalFeatureEnabled",
.function("isExperimentalFeatureEnabled", &Config::isExperimentalFeatureEnabled) &Config::setExperimentalFeatureEnabled)
; .function("setPointScaleFactor", &Config::setPointScaleFactor)
.function(
"isExperimentalFeatureEnabled",
&Config::isExperimentalFeatureEnabled);
value_object<Layout>("Layout") value_object<Layout>("Layout")
.field("left", &Layout::left) .field("left", &Layout::left)
.field("right", &Layout::right) .field("right", &Layout::right)
.field("top", &Layout::top) .field("top", &Layout::top)
.field("bottom", &Layout::bottom) .field("bottom", &Layout::bottom)
.field("width", &Layout::width) .field("width", &Layout::width)
.field("height", &Layout::height) .field("height", &Layout::height);
;
value_object<Size>("Size") value_object<Size>("Size")
.field("width", &Size::width) .field("width", &Size::width)
.field("height", &Size::height) .field("height", &Size::height);
;
value_object<Value>("Value") value_object<Value>("Value")
.field("value", &Value::value) .field("value", &Value::value)
.field("unit", &Value::unit) .field("unit", &Value::unit);
;
class_<Node>("Node") class_<Node>("Node")
.constructor<>(&Node::createDefault, allow_raw_pointers()) .constructor<>(&Node::createDefault, allow_raw_pointers())
.class_function<>("createDefault", &Node::createDefault, allow_raw_pointers()) .class_function<>(
.class_function<>("createWithConfig", &Node::createWithConfig, allow_raw_pointers()) "createDefault", &Node::createDefault, allow_raw_pointers())
.class_function<>("destroy", &Node::destroy, allow_raw_pointers()) .class_function<>(
.function("reset", &Node::reset) "createWithConfig", &Node::createWithConfig, allow_raw_pointers())
.class_function<>("destroy", &Node::destroy, allow_raw_pointers())
.function("reset", &Node::reset)
.function("copyStyle", &Node::copyStyle) .function("copyStyle", &Node::copyStyle)
.function("setPositionType", &Node::setPositionType) .function("setPositionType", &Node::setPositionType)
.function("setPosition", &Node::setPosition) .function("setPosition", &Node::setPosition)
.function("setPositionPercent", &Node::setPositionPercent) .function("setPositionPercent", &Node::setPositionPercent)
.function("setAlignContent", &Node::setAlignContent) .function("setAlignContent", &Node::setAlignContent)
.function("setAlignItems", &Node::setAlignItems) .function("setAlignItems", &Node::setAlignItems)
.function("setAlignSelf", &Node::setAlignSelf) .function("setAlignSelf", &Node::setAlignSelf)
.function("setFlexDirection", &Node::setFlexDirection) .function("setFlexDirection", &Node::setFlexDirection)
.function("setFlexWrap", &Node::setFlexWrap) .function("setFlexWrap", &Node::setFlexWrap)
.function("setJustifyContent", &Node::setJustifyContent) .function("setJustifyContent", &Node::setJustifyContent)
.function("setMargin", &Node::setMargin) .function("setMargin", &Node::setMargin)
.function("setMarginPercent", &Node::setMarginPercent) .function("setMarginPercent", &Node::setMarginPercent)
.function("setMarginAuto", &Node::setMarginAuto) .function("setMarginAuto", &Node::setMarginAuto)
.function("setOverflow", &Node::setOverflow) .function("setOverflow", &Node::setOverflow)
.function("setDisplay", &Node::setDisplay) .function("setDisplay", &Node::setDisplay)
.function("setFlex", &Node::setFlex) .function("setFlex", &Node::setFlex)
.function("setFlexBasis", &Node::setFlexBasis) .function("setFlexBasis", &Node::setFlexBasis)
.function("setFlexBasisPercent", &Node::setFlexBasisPercent) .function("setFlexBasisPercent", &Node::setFlexBasisPercent)
.function("setFlexGrow", &Node::setFlexGrow) .function("setFlexGrow", &Node::setFlexGrow)
.function("setFlexShrink", &Node::setFlexShrink) .function("setFlexShrink", &Node::setFlexShrink)
.function("setWidth", &Node::setWidth) .function("setWidth", &Node::setWidth)
.function("setWidthPercent", &Node::setWidthPercent) .function("setWidthPercent", &Node::setWidthPercent)
.function("setWidthAuto", &Node::setWidthAuto) .function("setWidthAuto", &Node::setWidthAuto)
.function("setHeight", &Node::setHeight) .function("setHeight", &Node::setHeight)
.function("setHeightPercent", &Node::setHeightPercent) .function("setHeightPercent", &Node::setHeightPercent)
.function("setHeightAuto", &Node::setHeightAuto) .function("setHeightAuto", &Node::setHeightAuto)
.function("setMinWidth", &Node::setMinWidth) .function("setMinWidth", &Node::setMinWidth)
.function("setMinWidthPercent", &Node::setMinWidthPercent) .function("setMinWidthPercent", &Node::setMinWidthPercent)
.function("setMinHeight", &Node::setMinHeight) .function("setMinHeight", &Node::setMinHeight)
.function("setMinHeightPercent", &Node::setMinHeightPercent) .function("setMinHeightPercent", &Node::setMinHeightPercent)
.function("setMaxWidth", &Node::setMaxWidth) .function("setMaxWidth", &Node::setMaxWidth)
.function("setMaxWidthPercent", &Node::setMaxWidthPercent) .function("setMaxWidthPercent", &Node::setMaxWidthPercent)
.function("setMaxHeight", &Node::setMaxHeight) .function("setMaxHeight", &Node::setMaxHeight)
.function("setMaxHeightPercent", &Node::setMaxHeightPercent) .function("setMaxHeightPercent", &Node::setMaxHeightPercent)
.function("setAspectRatio", &Node::setAspectRatio) .function("setAspectRatio", &Node::setAspectRatio)
.function("setBorder", &Node::setBorder) .function("setBorder", &Node::setBorder)
.function("setPadding", &Node::setPadding) .function("setPadding", &Node::setPadding)
.function("setPaddingPercent", &Node::setPaddingPercent) .function("setPaddingPercent", &Node::setPaddingPercent)
.function("setGap", &Node::setGap) .function("setGap", &Node::setGap)
.function("getPositionType", &Node::getPositionType) .function("getPositionType", &Node::getPositionType)
.function("getPosition", &Node::getPosition) .function("getPosition", &Node::getPosition)
.function("getAlignContent", &Node::getAlignContent) .function("getAlignContent", &Node::getAlignContent)
.function("getAlignItems", &Node::getAlignItems) .function("getAlignItems", &Node::getAlignItems)
.function("getAlignSelf", &Node::getAlignSelf) .function("getAlignSelf", &Node::getAlignSelf)
.function("getFlexDirection", &Node::getFlexDirection) .function("getFlexDirection", &Node::getFlexDirection)
.function("getFlexWrap", &Node::getFlexWrap) .function("getFlexWrap", &Node::getFlexWrap)
.function("getJustifyContent", &Node::getJustifyContent) .function("getJustifyContent", &Node::getJustifyContent)
.function("getMargin", &Node::getMargin) .function("getMargin", &Node::getMargin)
.function("getFlexBasis", &Node::getFlexBasis) .function("getFlexBasis", &Node::getFlexBasis)
.function("getFlexGrow", &Node::getFlexGrow) .function("getFlexGrow", &Node::getFlexGrow)
.function("getFlexShrink", &Node::getFlexShrink) .function("getFlexShrink", &Node::getFlexShrink)
.function("getWidth", &Node::getWidth) .function("getWidth", &Node::getWidth)
.function("getHeight", &Node::getHeight) .function("getHeight", &Node::getHeight)
.function("getMinWidth", &Node::getMinWidth) .function("getMinWidth", &Node::getMinWidth)
.function("getMinHeight", &Node::getMinHeight) .function("getMinHeight", &Node::getMinHeight)
.function("getMaxWidth", &Node::getMaxWidth) .function("getMaxWidth", &Node::getMaxWidth)
.function("getMaxHeight", &Node::getMaxHeight) .function("getMaxHeight", &Node::getMaxHeight)
.function("getAspectRatio", &Node::getAspectRatio) .function("getAspectRatio", &Node::getAspectRatio)
.function("getBorder", &Node::getBorder) .function("getBorder", &Node::getBorder)
.function("getOverflow", &Node::getOverflow) .function("getOverflow", &Node::getOverflow)
.function("getDisplay", &Node::getDisplay) .function("getDisplay", &Node::getDisplay)
.function("getPadding", &Node::getPadding) .function("getPadding", &Node::getPadding)
.function("getGap", &Node::getGap) .function("getGap", &Node::getGap)
.function("insertChild", &Node::insertChild, allow_raw_pointers()) .function("insertChild", &Node::insertChild, allow_raw_pointers())
.function("removeChild", &Node::removeChild, allow_raw_pointers()) .function("removeChild", &Node::removeChild, allow_raw_pointers())
.function("getChildCount", &Node::getChildCount) .function("getChildCount", &Node::getChildCount)
.function("getParent", &Node::getParent, allow_raw_pointers()) .function("getParent", &Node::getParent, allow_raw_pointers())
.function("getChild", &Node::getChild, allow_raw_pointers()) .function("getChild", &Node::getChild, allow_raw_pointers())
.function("isReferenceBaseline", &Node::isReferenceBaseline) .function("isReferenceBaseline", &Node::isReferenceBaseline)
.function("setIsReferenceBaseline", &Node::setIsReferenceBaseline) .function("setIsReferenceBaseline", &Node::setIsReferenceBaseline)
.function("setMeasureFunc", &Node::setMeasureFunc, allow_raw_pointers()) .function("setMeasureFunc", &Node::setMeasureFunc, allow_raw_pointers())
.function("unsetMeasureFunc", &Node::unsetMeasureFunc) .function("unsetMeasureFunc", &Node::unsetMeasureFunc)
.function("setDirtiedFunc", &Node::setDirtiedFunc, allow_raw_pointers()) .function("setDirtiedFunc", &Node::setDirtiedFunc, allow_raw_pointers())
.function("unsetDirtiedFunc", &Node::unsetDirtiedFunc) .function("unsetDirtiedFunc", &Node::unsetDirtiedFunc)
.function("markDirty", &Node::markDirty) .function("markDirty", &Node::markDirty)
.function("isDirty", &Node::isDirty) .function("isDirty", &Node::isDirty)
.function("calculateLayout", &Node::calculateLayout) .function("calculateLayout", &Node::calculateLayout)
.function("getComputedLeft", &Node::getComputedLeft) .function("getComputedLeft", &Node::getComputedLeft)
.function("getComputedRight", &Node::getComputedRight) .function("getComputedRight", &Node::getComputedRight)
.function("getComputedTop", &Node::getComputedTop) .function("getComputedTop", &Node::getComputedTop)
.function("getComputedBottom", &Node::getComputedBottom) .function("getComputedBottom", &Node::getComputedBottom)
.function("getComputedWidth", &Node::getComputedWidth) .function("getComputedWidth", &Node::getComputedWidth)
.function("getComputedHeight", &Node::getComputedHeight) .function("getComputedHeight", &Node::getComputedHeight)
.function("getComputedLayout", &Node::getComputedLayout) .function("getComputedLayout", &Node::getComputedLayout)
.function("getComputedMargin", &Node::getComputedMargin) .function("getComputedMargin", &Node::getComputedMargin)
.function("getComputedBorder", &Node::getComputedBorder) .function("getComputedBorder", &Node::getComputedBorder)
.function("getComputedPadding", &Node::getComputedPadding) .function("getComputedPadding", &Node::getComputedPadding);
;
} }