Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added feature to use rounded values #256

Closed
wants to merge 13 commits into from
Closed

Added feature to use rounded values #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
69afffc
added feature to use rounded values
woehrl01 Nov 19, 2016
d27c661
added some tests and changed distribution logic to equal distribution
woehrl01 Nov 19, 2016
8f2c45e
fix include on non VS and no need to round when casting is enough
woehrl01 Nov 20, 2016
bcc524e
Fix macro call
woehrl01 Nov 20, 2016
c91e7e0
reworked the rounding algorithm to be more opt-in
woehrl01 Nov 21, 2016
4183d1b
renamed method
woehrl01 Nov 21, 2016
b9d1219
Merge branch 'rounding-feature' of https://github.com/woehrl01/css-la…
woehrl01 Nov 21, 2016
c0a8746
use static on roundToPixelGrid
woehrl01 Nov 21, 2016
438bee1
added extended tests
woehrl01 Nov 21, 2016
3baa632
added the html layout of the test to the top, removed the gentest hin…
woehrl01 Nov 21, 2016
8de20bc
remove +1 as there is now a feature
woehrl01 Nov 21, 2016
1d72738
read +1 and added tests for measure with fraction
woehrl01 Nov 21, 2016
efd55e1
remove vs header
woehrl01 Nov 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CSSLayout/CSSEnums.h
View file
Open in desktop
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: 23 additions & 2 deletions CSSLayout/CSSLayout.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2462,6 +2462,23 @@ 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 @@ -2511,6 +2528,10 @@ void CSSNodeCalculateLayout(const CSSNodeRef node,
"l")) {
setPosition(node, node->layout.direction);

if (CSSLayoutIsExperimentalFeatureEnabled(CSSExperimentalFeatureRounding)){
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's keep this in here as it is very little memory and changing this back and forth when adding/removing experiments is just annoying.

roundToPixelGrid(node);
}

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

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

Expand All @@ -2559,4 +2580,4 @@ void CSSLayoutSetMemoryFuncs(CSSMalloc cssMalloc,
gCSSRealloc = cssRealloc;
gCSSFree = cssFree;
}
}
}
Loading