From 88c368b488139ad7e25aa55065fde53ef4727d30 Mon Sep 17 00:00:00 2001 From: Valentin Shergin Date: Thu, 26 Apr 2018 17:51:31 -0700 Subject: [PATCH] Fabric/Graphics: New graphic values conversion functions and type refinments Summary: Quite trivial. We need this to debug print LayoutMetrics. Reviewed By: fkgozali Differential Revision: D7607417 fbshipit-source-id: f4fa52ad04be9757545a8ac627db184f171288e5 --- .../graphics/graphicValuesConversions.cpp | 26 +++++++++++++++++-- .../graphics/graphicValuesConversions.h | 14 ++++++++-- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/ReactCommon/fabric/graphics/graphicValuesConversions.cpp b/ReactCommon/fabric/graphics/graphicValuesConversions.cpp index cfd80a4a114..8a09a460f27 100644 --- a/ReactCommon/fabric/graphics/graphicValuesConversions.cpp +++ b/ReactCommon/fabric/graphics/graphicValuesConversions.cpp @@ -7,10 +7,12 @@ #include "graphicValuesConversions.h" +#include + namespace facebook { namespace react { -SharedColor colorFromDynamic(folly::dynamic value) { +SharedColor colorFromDynamic(const folly::dynamic &value) { float red; float green; float blue; @@ -37,7 +39,7 @@ SharedColor colorFromDynamic(folly::dynamic value) { return colorFromComponents(red, green, blue, alpha); } -std::string colorNameFromColor(SharedColor value) { +std::string colorNameFromColor(const SharedColor &value) { ColorComponents components = colorComponentsFromColor(value); const float ratio = 256; return "rgba(" + @@ -47,5 +49,25 @@ std::string colorNameFromColor(SharedColor value) { folly::to(round(components.alpha * ratio)) + ")"; } +std::string stringFromPoint(const Point &point) { + return "{" + folly::to(point.x) + ", " + folly::to(point.y) + "}"; +} + +std::string stringFromSize(const Size &size) { + return "{" + folly::to(size.width) + ", " + folly::to(size.height) + "}"; +} + +std::string stringFromRect(const Rect &rect) { + return "{" + stringFromPoint(rect.origin) + ", " + stringFromSize(rect.size) + "}"; +} + +std::string stringFromEdgeInsets(const EdgeInsets &edgeInsets) { + return "{" + + folly::to(edgeInsets.left) + ", " + + folly::to(edgeInsets.top) + ", " + + folly::to(edgeInsets.right) + ", " + + folly::to(edgeInsets.bottom) + "}"; +} + } // namespace react } // namespace facebook diff --git a/ReactCommon/fabric/graphics/graphicValuesConversions.h b/ReactCommon/fabric/graphics/graphicValuesConversions.h index 8ee9e2799d3..99774a41fe0 100644 --- a/ReactCommon/fabric/graphics/graphicValuesConversions.h +++ b/ReactCommon/fabric/graphics/graphicValuesConversions.h @@ -9,12 +9,22 @@ #include #include +#include namespace facebook { namespace react { -SharedColor colorFromDynamic(folly::dynamic value); -std::string colorNameFromColor(SharedColor value); +#pragma mark - Color + +SharedColor colorFromDynamic(const folly::dynamic &value); +std::string colorNameFromColor(const SharedColor &value); + +#pragma mark - Geometry + +std::string stringFromPoint(const Point &point); +std::string stringFromSize(const Size &size); +std::string stringFromRect(const Rect &rect); +std::string stringFromEdgeInsets(const EdgeInsets &edgeInsets); } // namespace react } // namespace facebook