Skip to content
This repository has been archived by the owner on Aug 12, 2022. It is now read-only.

Commit

Permalink
Closes #109
Browse files Browse the repository at this point in the history
  • Loading branch information
nbilyk committed Feb 15, 2019
1 parent 4ca99fc commit d278fef
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,12 @@ open class BoxStyle : StyleBase() {
override val type: StyleType<BoxStyle> = Companion

var linearGradient: LinearGradientRo? by prop<LinearGradientRo?>(null)
var backgroundColor: ColorRo by prop(Color.CLEAR)

@Deprecated("Renamed to borderColors", ReplaceWith("borderColors"))
var borderColor: BorderColorsRo
get() = borderColors
set(value) {
borderColors = value
}
var backgroundColor: ColorRo by prop(Color.BLACK)

var borderColors: BorderColorsRo by prop(BorderColors())

@Deprecated("Renamed to borderThicknesses", ReplaceWith("borderThicknesses"))
var borderThickness: PadRo
get() = borderThicknesses
set(value) {
borderThicknesses = value
}

var borderThicknesses: PadRo by prop(Pad())

@Deprecated("Renamed to borderRadii", ReplaceWith("borderRadii"))
var borderRadius: CornersRo
get() = borderRadii
set(value) {
borderRadii = value
}

var borderRadii: CornersRo by prop(Corners())

var margin: PadRo by prop(Pad())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ open class GlRect(
}

init {
defaultWidth = 100f
defaultHeight = 50f
watch(style) {
simpleMode = it.borderRadii.isEmpty() && it.linearGradient == null
if (simpleMode) clearChildren(dispose = false)
Expand All @@ -88,7 +90,6 @@ open class GlRect(
validation.addNode(ValidationFlags.RESERVED_1, ValidationFlags.STYLES or ValidationFlags.CONCATENATED_TRANSFORM or ValidationFlags.LAYOUT or ValidationFlags.CONCATENATED_COLOR_TRANSFORM, this::updateSimpleModeVertices)
}


override fun updateLayout(explicitWidth: Float?, explicitHeight: Float?, out: Bounds) {
if (simpleMode) return
val margin = style.margin
Expand Down

0 comments on commit d278fef

Please sign in to comment.