From 99b73ed46d91e993c9a48221aa7242e779ecfd67 Mon Sep 17 00:00:00 2001 From: Atul R Date: Thu, 6 Jun 2019 16:15:15 +0200 Subject: [PATCH] fix todos and cleanup names --- binding.gyp | 2 +- config/{yoga.gypi => deps.gypi} | 1 + src/cpp/core/FlexLayout/flexlayout.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) rename config/{yoga.gypi => deps.gypi} (93%) diff --git a/binding.gyp b/binding.gyp index 3eec123a5..b9a20b5b2 100644 --- a/binding.gyp +++ b/binding.gyp @@ -2,7 +2,7 @@ "includes": [ "./config/application.gypi", "./config/moc.gypi", - './config/yoga.gypi' + './config/deps.gypi' ], "targets": [] } diff --git a/config/yoga.gypi b/config/deps.gypi similarity index 93% rename from config/yoga.gypi rename to config/deps.gypi index 719226fde..383a0baae 100644 --- a/config/yoga.gypi +++ b/config/deps.gypi @@ -1,6 +1,7 @@ { "includes": [], "target_defaults": { + "include_dirs": ['../deps/'], "sources": [ "../deps/yoga/Yoga.cpp", "../deps/yoga/YGValue.cpp", diff --git a/src/cpp/core/FlexLayout/flexlayout.cpp b/src/cpp/core/FlexLayout/flexlayout.cpp index 456262d96..de8ee7a36 100644 --- a/src/cpp/core/FlexLayout/flexlayout.cpp +++ b/src/cpp/core/FlexLayout/flexlayout.cpp @@ -102,7 +102,7 @@ void FlexLayout::setGeometry(const QRect &rect) } int availableWidth = rect.width(); int availableHeight = rect.height(); - YGDirection direction = YGDirection::YGDirectionLTR; //TODO + YGDirection direction = YGNodeStyleGetDirection(this->node); YGNodeCalculateLayout(this->node,availableWidth,availableHeight,direction); uint count = YGNodeGetChildCount(this->node);