Move configuration to new YGConfig and pass them down to CalculateLayout
Summary: Move configuration to new ```YGConfig``` and pass them down to CalculateLayout. See #418 . Adds ```YGConfigNew()``` + ```YGConfigFree```, and changed ```YGSetExperimentalFeatureEnabled``` to use the config. New function for calculation is ```YGNodeCalculateLayoutWithConfig```. Closes https://github.com/facebook/yoga/pull/432 Reviewed By: astreet Differential Revision: D4611359 Pulled By: emilsjolander fbshipit-source-id: a1332f0e1b21cec02129dd021ee57408449e10b0
This commit is contained in:
committed by
Facebook Github Bot
parent
8668e43f6d
commit
37c48257ae
49
javascript/sources/Config.hh
Normal file
49
javascript/sources/Config.hh
Normal file
@@ -0,0 +1,49 @@
|
||||
/**
|
||||
* Copyright (c) 2014-present, Facebook, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This source code is licensed under the BSD-style license found in the
|
||||
* LICENSE file in the root directory of this source tree. An additional grant
|
||||
* of patent rights can be found in the PATENTS file in the same directory.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <nbind/api.h>
|
||||
#include <nbind/BindDefiner.h>
|
||||
#include <yoga/Yoga.h>
|
||||
|
||||
class Config {
|
||||
private:
|
||||
YGConfigRef m_config;
|
||||
|
||||
Config(void)
|
||||
: m_config(YGConfigNew())
|
||||
{}
|
||||
|
||||
public:
|
||||
|
||||
static Config * create(void)
|
||||
{
|
||||
return new Config();
|
||||
}
|
||||
|
||||
static void destroy(Config * config)
|
||||
{
|
||||
delete config;
|
||||
}
|
||||
|
||||
~Config(void)
|
||||
{
|
||||
YGConfigFree(m_config);
|
||||
}
|
||||
|
||||
void setExperimentalFeatureEnabled(int feature, bool enabled)
|
||||
{
|
||||
YGConfigSetExperimentalFeatureEnabled(m_config, static_cast<YGExperimentalFeature>(feature), enabled);
|
||||
}
|
||||
|
||||
Config(Config const &) = delete;
|
||||
|
||||
Config const & operator=(Config const &) = delete;
|
||||
};
|
@@ -14,6 +14,7 @@
|
||||
#include "./Node.hh"
|
||||
#include "./Layout.hh"
|
||||
#include "./Size.hh"
|
||||
#include "./Config.hh"
|
||||
|
||||
static YGSize globalMeasureFunc(YGNodeRef nodeRef, float width, YGMeasureMode widthMode, float height, YGMeasureMode heightMode)
|
||||
{
|
||||
|
@@ -18,12 +18,14 @@
|
||||
#include "./Layout.hh"
|
||||
#include "./Size.hh"
|
||||
#include "./Value.hh"
|
||||
#include "./Config.hh"
|
||||
|
||||
class Node {
|
||||
|
||||
public:
|
||||
|
||||
static Node * create(void);
|
||||
static Node * create(Config * config);
|
||||
static void destroy(Node * node);
|
||||
|
||||
public:
|
||||
|
@@ -11,16 +11,6 @@
|
||||
|
||||
#include "./global.hh"
|
||||
|
||||
void setExperimentalFeatureEnabled(int feature, bool enabled)
|
||||
{
|
||||
YGSetExperimentalFeatureEnabled(static_cast<YGExperimentalFeature>(feature), enabled);
|
||||
}
|
||||
|
||||
bool isExperimentalFeatureEnabled(int feature)
|
||||
{
|
||||
return YGIsExperimentalFeatureEnabled(static_cast<YGExperimentalFeature>(feature));
|
||||
}
|
||||
|
||||
unsigned getInstanceCount(void)
|
||||
{
|
||||
return YGNodeGetInstanceCount();
|
||||
|
@@ -9,7 +9,4 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
void setExperimentalFeatureEnabled(int feature, bool enabled);
|
||||
bool isExperimentalFeatureEnabled(int feature);
|
||||
|
||||
unsigned getInstanceCount(void);
|
||||
|
@@ -13,6 +13,7 @@
|
||||
#include "./Layout.hh"
|
||||
#include "./Size.hh"
|
||||
#include "./Value.hh"
|
||||
#include "./Config.hh"
|
||||
#include "./global.hh"
|
||||
|
||||
#define NBIND_DUPLICATE_POINTERS true
|
||||
@@ -21,8 +22,6 @@
|
||||
|
||||
NBIND_GLOBAL()
|
||||
{
|
||||
function(setExperimentalFeatureEnabled);
|
||||
function(isExperimentalFeatureEnabled);
|
||||
function(getInstanceCount);
|
||||
}
|
||||
|
||||
@@ -43,6 +42,13 @@ NBIND_CLASS(Value)
|
||||
construct<int, double>();
|
||||
}
|
||||
|
||||
NBIND_CLASS(Config)
|
||||
{
|
||||
method(create);
|
||||
method(destroy);
|
||||
method(setExperimentalFeatureEnabled);
|
||||
}
|
||||
|
||||
NBIND_CLASS(Node)
|
||||
{
|
||||
method(create);
|
||||
|
Reference in New Issue
Block a user