Skip to content

Commit

Permalink
Added feature to use rounded values
Browse files Browse the repository at this point in the history
Summary:
Added an experimental feature to allow to use only rounded values. See #184. It's not a perfect solution and definitely  can be further improved. I'm looking forward to your ideas.
Closes facebook/yoga#256

Reviewed By: splhack

Differential Revision: D4214168

Pulled By: emilsjolander

fbshipit-source-id: 6293352d479b7b4dad258eb3f9e0afaa11cf7236
  • Loading branch information
woehrl01 authored and Facebook Github Bot committed Nov 22, 2016
1 parent 4954374 commit 1c69b61
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 9 deletions.
1 change: 1 addition & 0 deletions React/CSSLayout/CSSEnums.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ typedef enum CSSDirection {
} CSSDirection;

typedef enum CSSExperimentalFeature {
CSSExperimentalFeatureRounding,
CSSExperimentalFeatureCount,
} CSSExperimentalFeature;

Expand Down
25 changes: 24 additions & 1 deletion React/CSSLayout/CSSLayout.c
Original file line number Diff line number Diff line change
Expand Up @@ -2534,6 +2534,25 @@ bool layoutNodeInternal(const CSSNodeRef node,
return (needToVisitNode || cachedResults == NULL);
}

static void roundToPixelGrid(const CSSNodeRef node) {
const float fractialLeft =
node->layout.position[CSSEdgeLeft] - floorf(node->layout.position[CSSEdgeLeft]);
const float fractialTop =
node->layout.position[CSSEdgeTop] - floorf(node->layout.position[CSSEdgeTop]);
node->layout.dimensions[CSSDimensionWidth] =
roundf(fractialLeft + node->layout.dimensions[CSSDimensionWidth]) - roundf(fractialLeft);
node->layout.dimensions[CSSDimensionHeight] =
roundf(fractialTop + node->layout.dimensions[CSSDimensionHeight]) - roundf(fractialTop);

node->layout.position[CSSEdgeLeft] = roundf(node->layout.position[CSSEdgeLeft]);
node->layout.position[CSSEdgeTop] = roundf(node->layout.position[CSSEdgeTop]);

const uint32_t childCount = CSSNodeListCount(node->children);
for (uint32_t i = 0; i < childCount; i++) {
roundToPixelGrid(CSSNodeGetChild(node, i));
}
}

void CSSNodeCalculateLayout(const CSSNodeRef node,
const float availableWidth,
const float availableHeight,
Expand Down Expand Up @@ -2583,6 +2602,10 @@ void CSSNodeCalculateLayout(const CSSNodeRef node,
"l")) {
setPosition(node, node->layout.direction);

if (CSSLayoutIsExperimentalFeatureEnabled(CSSExperimentalFeatureRounding)) {
roundToPixelGrid(node);
}

if (gPrintTree) {
CSSNodePrint(node, CSSPrintOptionsLayout | CSSPrintOptionsChildren | CSSPrintOptionsStyle);
}
Expand All @@ -2606,7 +2629,7 @@ void CSSLayoutSetExperimentalFeatureEnabled(CSSExperimentalFeature feature, bool
experimentalFeatures[feature] = enabled;
}

bool CSSLayoutIsExperimentalFeatureEnabled(CSSExperimentalFeature feature) {
inline bool CSSLayoutIsExperimentalFeatureEnabled(CSSExperimentalFeature feature) {
return experimentalFeatures[feature];
}

Expand Down
9 changes: 6 additions & 3 deletions React/CSSLayout/CSSLayout.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,12 @@ CSS_NODE_STYLE_PROPERTY(float, MaxHeight, maxHeight);
// Yoga specific properties, not compatible with flexbox specification
// Aspect ratio control the size of the undefined dimension of a node.
// - On a node with a set width/height aspect ratio control the size of the unset dimension
// - On a node with a set flex basis aspect ratio controls the size of the node in the cross axis if unset
// - On a node with a measure function aspect ratio works as though the measure function measures the flex basis
// - On a node with flex grow/shrink aspect ratio controls the size of the node in the cross axis if unset
// - On a node with a set flex basis aspect ratio controls the size of the node in the cross axis if
// unset
// - On a node with a measure function aspect ratio works as though the measure function measures
// the flex basis
// - On a node with flex grow/shrink aspect ratio controls the size of the node in the cross axis if
// unset
// - Aspect ratio takes min/max dimensions into account
CSS_NODE_STYLE_PROPERTY(float, AspectRatio, aspectRatio);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
package com.facebook.csslayout;

public enum CSSExperimentalFeature {
__EMPTY(-1);
ROUNDING(0);

private int mIntValue;

CSSExperimentalFeature(int intValue) {
Expand All @@ -23,6 +24,7 @@ public int intValue() {

public static CSSExperimentalFeature fromInt(int value) {
switch (value) {
case 0: return ROUNDING;
default: throw new IllegalArgumentException("Unkown enum value: " + value);
}
}
Expand Down
1 change: 1 addition & 0 deletions ReactCommon/CSSLayout/CSSLayout/CSSEnums.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ typedef enum CSSDirection {
} CSSDirection;

typedef enum CSSExperimentalFeature {
CSSExperimentalFeatureRounding,
CSSExperimentalFeatureCount,
} CSSExperimentalFeature;

Expand Down
25 changes: 24 additions & 1 deletion ReactCommon/CSSLayout/CSSLayout/CSSLayout.c
Original file line number Diff line number Diff line change
Expand Up @@ -2534,6 +2534,25 @@ bool layoutNodeInternal(const CSSNodeRef node,
return (needToVisitNode || cachedResults == NULL);
}

static void roundToPixelGrid(const CSSNodeRef node) {
const float fractialLeft =
node->layout.position[CSSEdgeLeft] - floorf(node->layout.position[CSSEdgeLeft]);
const float fractialTop =
node->layout.position[CSSEdgeTop] - floorf(node->layout.position[CSSEdgeTop]);
node->layout.dimensions[CSSDimensionWidth] =
roundf(fractialLeft + node->layout.dimensions[CSSDimensionWidth]) - roundf(fractialLeft);
node->layout.dimensions[CSSDimensionHeight] =
roundf(fractialTop + node->layout.dimensions[CSSDimensionHeight]) - roundf(fractialTop);

node->layout.position[CSSEdgeLeft] = roundf(node->layout.position[CSSEdgeLeft]);
node->layout.position[CSSEdgeTop] = roundf(node->layout.position[CSSEdgeTop]);

const uint32_t childCount = CSSNodeListCount(node->children);
for (uint32_t i = 0; i < childCount; i++) {
roundToPixelGrid(CSSNodeGetChild(node, i));
}
}

void CSSNodeCalculateLayout(const CSSNodeRef node,
const float availableWidth,
const float availableHeight,
Expand Down Expand Up @@ -2583,6 +2602,10 @@ void CSSNodeCalculateLayout(const CSSNodeRef node,
"l")) {
setPosition(node, node->layout.direction);

if (CSSLayoutIsExperimentalFeatureEnabled(CSSExperimentalFeatureRounding)) {
roundToPixelGrid(node);
}

if (gPrintTree) {
CSSNodePrint(node, CSSPrintOptionsLayout | CSSPrintOptionsChildren | CSSPrintOptionsStyle);
}
Expand All @@ -2606,7 +2629,7 @@ void CSSLayoutSetExperimentalFeatureEnabled(CSSExperimentalFeature feature, bool
experimentalFeatures[feature] = enabled;
}

bool CSSLayoutIsExperimentalFeatureEnabled(CSSExperimentalFeature feature) {
inline bool CSSLayoutIsExperimentalFeatureEnabled(CSSExperimentalFeature feature) {
return experimentalFeatures[feature];
}

Expand Down
9 changes: 6 additions & 3 deletions ReactCommon/CSSLayout/CSSLayout/CSSLayout.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,12 @@ CSS_NODE_STYLE_PROPERTY(float, MaxHeight, maxHeight);
// Yoga specific properties, not compatible with flexbox specification
// Aspect ratio control the size of the undefined dimension of a node.
// - On a node with a set width/height aspect ratio control the size of the unset dimension
// - On a node with a set flex basis aspect ratio controls the size of the node in the cross axis if unset
// - On a node with a measure function aspect ratio works as though the measure function measures the flex basis
// - On a node with flex grow/shrink aspect ratio controls the size of the node in the cross axis if unset
// - On a node with a set flex basis aspect ratio controls the size of the node in the cross axis if
// unset
// - On a node with a measure function aspect ratio works as though the measure function measures
// the flex basis
// - On a node with flex grow/shrink aspect ratio controls the size of the node in the cross axis if
// unset
// - Aspect ratio takes min/max dimensions into account
CSS_NODE_STYLE_PROPERTY(float, AspectRatio, aspectRatio);

Expand Down

0 comments on commit 1c69b61

Please sign in to comment.