diff --git a/src/main/haxework/view/form/InputView.hx b/src/main/haxework/view/form/InputView.hx index 86d6c40..578d6f6 100755 --- a/src/main/haxework/view/form/InputView.hx +++ b/src/main/haxework/view/form/InputView.hx @@ -26,7 +26,7 @@ class InputView extends TextView { hintTextField = buildHintTextField(); content.addChild(hintTextField); - textFormat.align = TextFormatAlign.LEFT; + font.align = TextFormatAlign.LEFT; } private function set_hint(value:String):String { diff --git a/src/main/haxework/view/theme/GeometryStyle.hx b/src/main/haxework/view/theme/GeometryStyle.hx index 2def7a0..7e177c3 100644 --- a/src/main/haxework/view/theme/GeometryStyle.hx +++ b/src/main/haxework/view/theme/GeometryStyle.hx @@ -16,6 +16,18 @@ class GeometryStyle implements IStyle> { view.geometry.padding = geometry.padding.clone(); update = true; } + if (!geometry.margin.empty) { + view.geometry.margin = geometry.margin.clone(); + update = true; + } + if (geometry.width.value > 0) { + view.geometry.width = geometry.width; + update = true; + } + if (geometry.height.value > 0) { + view.geometry.height = geometry.height; + update = true; + } if (update) { view.toUpdateParent(); } diff --git a/src/main/haxework/view/theme/Theme.hx b/src/main/haxework/view/theme/Theme.hx index ca635d5..eca1477 100644 --- a/src/main/haxework/view/theme/Theme.hx +++ b/src/main/haxework/view/theme/Theme.hx @@ -125,12 +125,15 @@ class Theme implements ITheme { ]; } - public function text(?color:Color):StyleSet { + public function text(?color:Color, ?size:Null):StyleSet { if (color == null) { color = colors.text; } + if (size == null) { + size = baseFontSize; + } return [ - new FontStyle(new FontPreset(font.name, font.embed, color, baseFontSize)), + new FontStyle(new FontPreset(font.name, font.embed, color, size)), ]; }