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

setBaseLine -> setBaseline

Browse Source 
Summary:
@public

`setBaseLine` was the only place where we used a capitalised *L.* Fixed here.

Reviewed By: SidharthGuglani

Differential Revision: D14152320

fbshipit-source-id: abf54fe7d6088e03775968baa8421c4bf43d6a6e
This commit is contained in:
David Aurelio
2019-02-21 05:35:52 -08:00
committed by Facebook Github Bot
parent 05f36a835a
commit 7331de78bd
6 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/jni/YGJNI.cpp
View File

@@ -478,7 +478,7 @@ void jni_YGNodeSetHasBaselineFunc(
jlong nativePointer,
jboolean hasBaselineFunc) {
_jlong2YGNodeRef(nativePointer)
->setBaseLineFunc(hasBaselineFunc ? YGJNIBaselineFunc : nullptr);
->setBaselineFunc(hasBaselineFunc ? YGJNIBaselineFunc : nullptr);
}
void jni_YGNodeCopyStyle(jlong dstNativePointer, jlong srcNativePointer) {

20
tests/YGAlignBaselineTest.cpp
View File

@@ -200,7 +200,7 @@ TEST(YogaTest, align_baseline_parent_using_child_in_column_as_reference) {
const YGNodeRef root_child1_child1 =
createYGNode(config, YGFlexDirectionColumn, 500, 400, false);
root_child1_child1->setBaseLineFunc(_baselineFunc);
root_child1_child1->setBaselineFunc(_baselineFunc);
YGNodeSetIsReferenceBaseline(root_child1_child1, true);
YGNodeInsertChild(root_child1, root_child1_child1, 1);
@@ -245,7 +245,7 @@ TEST(
const YGNodeRef root_child1_child1 =
createYGNode(config, YGFlexDirectionColumn, 500, 400, false);
root_child1_child1->setBaseLineFunc(_baselineFunc);
root_child1_child1->setBaselineFunc(_baselineFunc);
YGNodeSetIsReferenceBaseline(root_child1_child1, true);
YGNodeStyleSetPadding(root_child1_child1, YGEdgeLeft, 100);
YGNodeStyleSetPadding(root_child1_child1, YGEdgeRight, 100);
@@ -298,7 +298,7 @@ TEST(
const YGNodeRef root_child1_child1 =
createYGNode(config, YGFlexDirectionColumn, 500, 400, false);
root_child1_child1->setBaseLineFunc(_baselineFunc);
root_child1_child1->setBaselineFunc(_baselineFunc);
YGNodeSetIsReferenceBaseline(root_child1_child1, true);
YGNodeInsertChild(root_child1, root_child1_child1, 1);
@@ -347,7 +347,7 @@ TEST(
const YGNodeRef root_child1_child1 =
createYGNode(config, YGFlexDirectionColumn, 500, 400, false);
root_child1_child1->setBaseLineFunc(_baselineFunc);
root_child1_child1->setBaselineFunc(_baselineFunc);
YGNodeSetIsReferenceBaseline(root_child1_child1, true);
YGNodeInsertChild(root_child1, root_child1_child1, 1);
@@ -392,7 +392,7 @@ TEST(
const YGNodeRef root_child1_child1 =
createYGNode(config, YGFlexDirectionColumn, 500, 400, false);
root_child1_child1->setBaseLineFunc(_baselineFunc);
root_child1_child1->setBaselineFunc(_baselineFunc);
YGNodeSetIsReferenceBaseline(root_child1_child1, true);
YGNodeStyleSetMargin(root_child1_child1, YGEdgeLeft, 100);
YGNodeStyleSetMargin(root_child1_child1, YGEdgeRight, 100);
@@ -439,7 +439,7 @@ TEST(YogaTest, align_baseline_parent_using_child_in_row_as_reference) {
const YGNodeRef root_child1_child1 =
createYGNode(config, YGFlexDirectionColumn, 500, 400, false);
root_child1_child1->setBaseLineFunc(_baselineFunc);
root_child1_child1->setBaselineFunc(_baselineFunc);
YGNodeSetIsReferenceBaseline(root_child1_child1, true);
YGNodeInsertChild(root_child1, root_child1_child1, 1);
@@ -484,7 +484,7 @@ TEST(
const YGNodeRef root_child1_child1 =
createYGNode(config, YGFlexDirectionColumn, 500, 400, false);
root_child1_child1->setBaseLineFunc(_baselineFunc);
root_child1_child1->setBaselineFunc(_baselineFunc);
YGNodeSetIsReferenceBaseline(root_child1_child1, true);
YGNodeStyleSetPadding(root_child1_child1, YGEdgeLeft, 100);
YGNodeStyleSetPadding(root_child1_child1, YGEdgeRight, 100);
@@ -533,7 +533,7 @@ TEST(
const YGNodeRef root_child1_child1 =
createYGNode(config, YGFlexDirectionColumn, 500, 400, false);
root_child1_child1->setBaseLineFunc(_baselineFunc);
root_child1_child1->setBaselineFunc(_baselineFunc);
YGNodeSetIsReferenceBaseline(root_child1_child1, true);
YGNodeStyleSetMargin(root_child1_child1, YGEdgeLeft, 100);
YGNodeStyleSetMargin(root_child1_child1, YGEdgeRight, 100);
@@ -673,7 +673,7 @@ TEST(
const YGNodeRef root_child1_child1 =
createYGNode(config, YGFlexDirectionColumn, 500, 400, false);
root_child1_child1->setBaseLineFunc(_baselineFunc);
root_child1_child1->setBaselineFunc(_baselineFunc);
YGNodeSetIsReferenceBaseline(root_child1_child1, true);
YGNodeInsertChild(root_child1, root_child1_child1, 1);
@@ -724,7 +724,7 @@ TEST(
const YGNodeRef root_child1_child1 =
createYGNode(config, YGFlexDirectionColumn, 500, 400, false);
root_child1_child1->setBaseLineFunc(_baselineFunc);
root_child1_child1->setBaselineFunc(_baselineFunc);
YGNodeSetIsReferenceBaseline(root_child1_child1, true);
YGNodeInsertChild(root_child1, root_child1_child1, 1);

2
tests/YGBaselineFuncTest.cpp
View File

@@ -34,7 +34,7 @@ TEST(YogaTest, align_baseline_customer_func) {
const YGNodeRef root_child1_child0 = YGNodeNew();
root_child1_child0->setContext(&baselineValue);
YGNodeStyleSetWidth(root_child1_child0, 50);
root_child1_child0->setBaseLineFunc(_baseline);
root_child1_child0->setBaselineFunc(_baseline);
YGNodeStyleSetHeight(root_child1_child0, 20);
YGNodeInsertChild(root_child1, root_child1_child0, 0);
YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);

16
tests/YGNodeCallbackTest.cpp
View File

@@ -97,20 +97,20 @@ TEST(YGNode, hasBaselineFunc_initial) {
TEST(YGNode, hasBaselineFunc_with_baseline_fn) {
auto n = YGNode{};
n.setBaseLineFunc([](YGNode*, float, float) { return 0.0f; });
n.setBaselineFunc([](YGNode*, float, float) { return 0.0f; });
ASSERT_TRUE(n.hasBaselineFunc());
}
TEST(YGNode, baseline_with_baseline_fn) {
auto n = YGNode{};
n.setBaseLineFunc([](YGNode*, float w, float h) { return w + h; });
n.setBaselineFunc([](YGNode*, float w, float h) { return w + h; });
ASSERT_EQ(n.baseline(1.25f, 2.5f, nullptr), 3.75f);
}
TEST(YGNode, baseline_with_context_baseline_fn) {
auto n = YGNode{};
n.setBaseLineFunc([](YGNode*, float w, float h, void* ctx) {
n.setBaselineFunc([](YGNode*, float w, float h, void* ctx) {
return w + h + *(float*) ctx;
});
@@ -120,15 +120,15 @@ TEST(YGNode, baseline_with_context_baseline_fn) {
TEST(YGNode, hasBaselineFunc_after_unset) {
auto n = YGNode{};
n.setBaseLineFunc([](YGNode*, float, float) { return 0.0f; });
n.setBaselineFunc([](YGNode*, float, float) { return 0.0f; });
n.setBaseLineFunc(nullptr);
n.setBaselineFunc(nullptr);
ASSERT_FALSE(n.hasBaselineFunc());
}
TEST(YGNode, hasBaselineFunc_after_unset_context) {
auto n = YGNode{};
n.setBaseLineFunc([](YGNode*, float, float, void*) { return 0.0f; });
n.setBaselineFunc([](YGNode*, float, float, void*) { return 0.0f; });
n.setMeasureFunc(nullptr);
ASSERT_FALSE(n.hasMeasureFunc());
@@ -136,8 +136,8 @@ TEST(YGNode, hasBaselineFunc_after_unset_context) {
TEST(YGNode, switching_baseline_fn_types) {
auto n = YGNode{};
n.setBaseLineFunc([](YGNode*, float, float, void*) { return 0.0f; });
n.setBaseLineFunc([](YGNode*, float, float) { return 1.0f; });
n.setBaselineFunc([](YGNode*, float, float, void*) { return 0.0f; });
n.setBaselineFunc([](YGNode*, float, float) { return 1.0f; });
ASSERT_EQ(n.baseline(1, 2, nullptr), 1.0f);
}

10
yoga/YGNode.h
View File

@@ -53,7 +53,7 @@ private:
const float axisSize) const;
void setMeasureFunc(decltype(measure_));
void setBaseLineFunc(decltype(baseline_));
void setBaselineFunc(decltype(baseline_));
public:
YGNode()
@@ -251,16 +251,16 @@ public:
return setMeasureFunc(YGMeasureFunc{nullptr});
}
void setBaseLineFunc(YGBaselineFunc baseLineFunc) {
void setBaselineFunc(YGBaselineFunc baseLineFunc) {
baselineUsesContext_ = false;
baseline_.noContext = baseLineFunc;
}
void setBaseLineFunc(BaselineWithContextFn baseLineFunc) {
void setBaselineFunc(BaselineWithContextFn baseLineFunc) {
baselineUsesContext_ = true;
baseline_.withContext = baseLineFunc;
}
void setBaseLineFunc(std::nullptr_t) {
return setBaseLineFunc(YGBaselineFunc{nullptr});
void setBaselineFunc(std::nullptr_t) {
return setBaselineFunc(YGBaselineFunc{nullptr});
}
void setDirtiedFunc(YGDirtiedFunc dirtiedFunc) {

2
yoga/Yoga.cpp
View File

@@ -158,7 +158,7 @@ bool YGNodeHasBaselineFunc(YGNodeRef node) {
}
void YGNodeSetBaselineFunc(YGNodeRef node, YGBaselineFunc baselineFunc) {
node->setBaseLineFunc(baselineFunc);
node->setBaselineFunc(baselineFunc);
}
YGDirtiedFunc YGNodeGetDirtiedFunc(YGNodeRef node) {