Commit 2b0e4784 authored by Adam Barth's avatar Adam Barth

Fix TextAlign.right

We were applying the style to the RenderInline but we actually needed to apply
it to the RenderParagraph. The lineHeight property had the same problem.
parent d9e9ece9
......@@ -140,6 +140,16 @@ class TextStyle {
FontWeight.w900: '900'
}[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) {
cssStyle['text-align'] = const {
TextAlign.left: 'left',
......@@ -150,13 +160,6 @@ class TextStyle {
if (height != null) {
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) {
......
......@@ -11,6 +11,9 @@ import 'package:sky/rendering/object.dart';
abstract class InlineBase {
sky.Node _toDOM(sky.Document owner);
String toString([String prefix = '']);
void _applyStyleToContainer(sky.Element container) {
}
}
class InlineText extends InlineBase {
......@@ -48,6 +51,10 @@ class InlineStyle extends InlineBase {
return parent;
}
void _applyStyleToContainer(sky.Element container) {
style.applyToContainerCSSStyle(container.style);
}
bool operator ==(other) {
if (identical(this, other))
return true;
......@@ -112,6 +119,8 @@ class RenderParagraph extends RenderBox {
return;
_inline = value;
_layoutRoot.rootElement.setChild(_inline._toDOM(_document));
_layoutRoot.rootElement.removeAttribute('style');
_inline._applyStyleToContainer(_layoutRoot.rootElement);
_constraintsForCurrentLayout = null;
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