Remove Style prefix in java and cs apis

Summary: The Style prefix does not make sense in the java and c# api and only a few methods had it. This diff removes the last of those.

Reviewed By: splhack

Differential Revision: D4232920

fbshipit-source-id: 6e2ff21bbb7e0e441892023c14df579d1bc7aa49
This commit is contained in:
Emil Sjolander
2016-11-29 09:04:43 -08:00
committed by Facebook Github Bot
parent 6318801470
commit 5fa42cd1b0
36 changed files with 833 additions and 828 deletions

View File

@@ -31,12 +31,13 @@ namespace Facebook.CSSLayout
Spacing margin = null,
Spacing padding = null,
Spacing border = null,
float? styleWidth = null,
float? styleHeight = null,
float? styleMaxWidth = null,
float? styleMaxHeight = null,
float? styleMinWidth = null,
float? styleMinHeight = null)
float? width = null,
float? height = null,
float? maxWidth = null,
float? maxHeight = null,
float? minWidth = null,
float? minHeight = null,
float? aspectRatio = null)
{
CSSNode node = new CSSNode();
@@ -197,38 +198,42 @@ namespace Facebook.CSSLayout
}
}
if (styleWidth.HasValue)
if (width.HasValue)
{
node.StyleWidth = styleWidth.Value;
node.Width = width.Value;
}
if (styleHeight.HasValue)
if (height.HasValue)
{
node.StyleHeight = styleHeight.Value;
node.Height = height.Value;
}
if (styleMinWidth.HasValue)
if (minWidth.HasValue)
{
node.StyleMinWidth = styleMinWidth.Value;
node.MinWidth = minWidth.Value;
}
if (styleMinHeight.HasValue)
if (minHeight.HasValue)
{
node.StyleMinHeight = styleMinHeight.Value;
node.MinHeight = minHeight.Value;
}
if (styleMaxWidth.HasValue)
if (maxWidth.HasValue)
{
node.StyleMaxWidth = styleMaxWidth.Value;
node.MaxWidth = maxWidth.Value;
}
if (styleMaxHeight.HasValue)
if (maxHeight.HasValue)
{
node.StyleMaxHeight = styleMaxHeight.Value;
node.MaxHeight = maxHeight.Value;
}
if (aspectRatio.HasValue)
{
node.AspectRatio = aspectRatio.Value;
}
return node;
}
}
}

View File

@@ -286,7 +286,7 @@ namespace Facebook.CSSLayout
Native.CSSNodeStyleSetPosition(_cssNode, edge, position);
}
public float StyleWidth
public float Width
{
get
{
@@ -299,7 +299,7 @@ namespace Facebook.CSSLayout
}
}
public float StyleHeight
public float Height
{
get
{
@@ -312,7 +312,7 @@ namespace Facebook.CSSLayout
}
}
public float StyleMaxWidth
public float MaxWidth
{
get
{
@@ -325,7 +325,7 @@ namespace Facebook.CSSLayout
}
}
public float StyleMaxHeight
public float MaxHeight
{
get
{
@@ -338,7 +338,7 @@ namespace Facebook.CSSLayout
}
}
public float StyleMinWidth
public float MinWidth
{
get
{
@@ -351,7 +351,7 @@ namespace Facebook.CSSLayout
}
}
public float StyleMinHeight
public float MinHeight
{
get
{
@@ -364,7 +364,7 @@ namespace Facebook.CSSLayout
}
}
public float StyleAspectRatio
public float AspectRatio
{
get
{