mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Neil Dhar
c68c55469f
Summary: Fix a bug in the constructor of `LineMeasurement` where it did not initialise `xHeight` correctly. Changelog: [Internal] Reviewed By: JoshuaGross Differential Revision: D27972942 fbshipit-source-id: a56d55fdfe286bd11a6a81a3d024504f070bdb19
69 lines
2.0 KiB
C++
69 lines
2.0 KiB
C++
/*
|
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
*
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*/
|
|
|
|
#include "TextMeasureCache.h"
|
|
|
|
namespace facebook {
|
|
namespace react {
|
|
|
|
static Rect rectFromDynamic(folly::dynamic const &data) {
|
|
Point origin;
|
|
origin.x = static_cast<Float>(data.getDefault("x", 0).getDouble());
|
|
origin.y = static_cast<Float>(data.getDefault("y", 0).getDouble());
|
|
Size size;
|
|
size.width = static_cast<Float>(data.getDefault("width", 0).getDouble());
|
|
size.height = static_cast<Float>(data.getDefault("height", 0).getDouble());
|
|
Rect frame;
|
|
frame.origin = origin;
|
|
frame.size = size;
|
|
return frame;
|
|
}
|
|
|
|
LineMeasurement::LineMeasurement(
|
|
std::string text,
|
|
Rect frame,
|
|
Float descender,
|
|
Float capHeight,
|
|
Float ascender,
|
|
Float xHeight)
|
|
: text(text),
|
|
frame(frame),
|
|
descender(descender),
|
|
capHeight(capHeight),
|
|
ascender(ascender),
|
|
xHeight(xHeight) {}
|
|
|
|
LineMeasurement::LineMeasurement(folly::dynamic const &data)
|
|
: text(data.getDefault("text", "").getString()),
|
|
frame(rectFromDynamic(data)),
|
|
descender(
|
|
static_cast<Float>(data.getDefault("descender", 0).getDouble())),
|
|
capHeight(
|
|
static_cast<Float>(data.getDefault("capHeight", 0).getDouble())),
|
|
ascender(static_cast<Float>(data.getDefault("ascender", 0).getDouble())),
|
|
xHeight(static_cast<Float>(data.getDefault("xHeight", 0).getDouble())) {}
|
|
|
|
bool LineMeasurement::operator==(LineMeasurement const &rhs) const {
|
|
return std::tie(
|
|
this->text,
|
|
this->frame,
|
|
this->descender,
|
|
this->capHeight,
|
|
this->ascender,
|
|
this->xHeight) ==
|
|
std::tie(
|
|
rhs.text,
|
|
rhs.frame,
|
|
rhs.descender,
|
|
rhs.capHeight,
|
|
rhs.ascender,
|
|
rhs.xHeight);
|
|
}
|
|
|
|
} // namespace react
|
|
} // namespace facebook
|