Skip to content

Commit

Permalink
fix(android): Use default border width only if we have borderColor de…
Browse files Browse the repository at this point in the history
…fined (#10402)

Default border width of 1 should be used only if we have a borderColor set.

Fixes TIMOB-26453
  • Loading branch information
ypbnv authored and sgtcoolguy committed Nov 29, 2018
1 parent 1de648f commit 6736e58
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1485,8 +1485,8 @@ private void initializeBorder(KrollDict d, Integer bgColor)
borderView.setColor(TiConvert.toColor(d, TiC.PROPERTY_BORDER_COLOR));
}

//Have a default border width of 1
Object borderWidth = "1";
//Have a default border width of 1 if the border has defined color.
Object borderWidth = d.containsKeyAndNotNull(TiC.PROPERTY_BORDER_COLOR) ? "1" : "0";
if (d.containsKey(TiC.PROPERTY_BORDER_WIDTH)) {
borderWidth = d.get(TiC.PROPERTY_BORDER_WIDTH);
} else {
Expand Down

0 comments on commit 6736e58

Please sign in to comment.