Commit c464b82f authored by Adam Barth's avatar Adam Barth

Merge pull request #419 from abarth/fix_align_right

Fix TextAlign.right
parents cb9376cb 2b0e4784
...@@ -140,6 +140,16 @@ class TextStyle { ...@@ -140,6 +140,16 @@ class TextStyle {
FontWeight.w900: '900' FontWeight.w900: '900'
}[fontWeight]; }[fontWeight];
} }
if (decoration != null) {
cssStyle['text-decoration'] = _decorationToCSSString(decoration);
if (decorationColor != null)
cssStyle['text-decoration-color'] = _colorToCSSString(decorationColor);
if (decorationStyle != null)
cssStyle['text-decoration-style'] = _decorationStyleToCSSString(decorationStyle);
}
}
void applyToContainerCSSStyle(CSSStyleDeclaration cssStyle) {
if (textAlign != null) { if (textAlign != null) {
cssStyle['text-align'] = const { cssStyle['text-align'] = const {
TextAlign.left: 'left', TextAlign.left: 'left',
...@@ -150,13 +160,6 @@ class TextStyle { ...@@ -150,13 +160,6 @@ class TextStyle {
if (height != null) { if (height != null) {
cssStyle['line-height'] = '${height}'; cssStyle['line-height'] = '${height}';
} }
if (decoration != null) {
cssStyle['text-decoration'] = _decorationToCSSString(decoration);
if (decorationColor != null)
cssStyle['text-decoration-color'] = _colorToCSSString(decorationColor);
if (decorationStyle != null)
cssStyle['text-decoration-style'] = _decorationStyleToCSSString(decorationStyle);
}
} }
bool operator ==(other) { bool operator ==(other) {
......
...@@ -11,6 +11,9 @@ import 'package:sky/rendering/object.dart'; ...@@ -11,6 +11,9 @@ import 'package:sky/rendering/object.dart';
abstract class InlineBase { abstract class InlineBase {
sky.Node _toDOM(sky.Document owner); sky.Node _toDOM(sky.Document owner);
String toString([String prefix = '']); String toString([String prefix = '']);
void _applyStyleToContainer(sky.Element container) {
}
} }
class InlineText extends InlineBase { class InlineText extends InlineBase {
...@@ -48,6 +51,10 @@ class InlineStyle extends InlineBase { ...@@ -48,6 +51,10 @@ class InlineStyle extends InlineBase {
return parent; return parent;
} }
void _applyStyleToContainer(sky.Element container) {
style.applyToContainerCSSStyle(container.style);
}
bool operator ==(other) { bool operator ==(other) {
if (identical(this, other)) if (identical(this, other))
return true; return true;
...@@ -112,6 +119,8 @@ class RenderParagraph extends RenderBox { ...@@ -112,6 +119,8 @@ class RenderParagraph extends RenderBox {
return; return;
_inline = value; _inline = value;
_layoutRoot.rootElement.setChild(_inline._toDOM(_document)); _layoutRoot.rootElement.setChild(_inline._toDOM(_document));
_layoutRoot.rootElement.removeAttribute('style');
_inline._applyStyleToContainer(_layoutRoot.rootElement);
_constraintsForCurrentLayout = null; _constraintsForCurrentLayout = null;
markNeedsLayout(); markNeedsLayout();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment