firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Plug TextDirection into box_decoration background gradient (#14810)

Browse Source 
* Plug TextDirection into box_decoration background gradient

* Add test
This commit is contained in:
Stefano Rodriguez 2018-03-09 02:00:21 +07:00 committed by Ian Hickson
parent afabdfecf9
commit b944cd7187
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/flutter/lib/src/painting/box_decoration.dart
View File

@ -325,7 +325,7 @@ class _BoxDecorationPainter extends BoxPainter {
Paint _cachedBackgroundPaint; Paint _cachedBackgroundPaint;
Rect _rectForCachedBackgroundPaint; Rect _rectForCachedBackgroundPaint;
Paint _getBackgroundPaint(Rect rect) { Paint _getBackgroundPaint(Rect rect, TextDirection textDirection) {
assert(rect != null); assert(rect != null);
assert(_decoration.gradient != null || _rectForCachedBackgroundPaint == null); assert(_decoration.gradient != null || _rectForCachedBackgroundPaint == null);
@ -335,7 +335,7 @@ class _BoxDecorationPainter extends BoxPainter {
if (_decoration.color != null) if (_decoration.color != null)
paint.color = _decoration.color; paint.color = _decoration.color;
if (_decoration.gradient != null) { if (_decoration.gradient != null) {
paint.shader = _decoration.gradient.createShader(rect); paint.shader = _decoration.gradient.createShader(rect, textDirection: textDirection);
_rectForCachedBackgroundPaint = rect; _rectForCachedBackgroundPaint = rect;
} }
_cachedBackgroundPaint = paint; _cachedBackgroundPaint = paint;
@ -376,7 +376,7 @@ class _BoxDecorationPainter extends BoxPainter {
void _paintBackgroundColor(Canvas canvas, Rect rect, TextDirection textDirection) { void _paintBackgroundColor(Canvas canvas, Rect rect, TextDirection textDirection) {
if (_decoration.color != null || _decoration.gradient != null) if (_decoration.color != null || _decoration.gradient != null)
_paintBox(canvas, rect, _getBackgroundPaint(rect), textDirection); _paintBox(canvas, rect, _getBackgroundPaint(rect, textDirection), textDirection);
} }
DecorationImagePainter _imagePainter; DecorationImagePainter _imagePainter;

26
packages/flutter/test/painting/box_decoration_test.dart
View File

@ -42,4 +42,30 @@ void main() {
expect(decoration.hitTest(size, const Offset(10.0, 10.0), textDirection: TextDirection.ltr), isFalse); expect(decoration.hitTest(size, const Offset(10.0, 10.0), textDirection: TextDirection.ltr), isFalse);
expect(decoration.hitTest(size, const Offset(990.0, 10.0), textDirection: TextDirection.ltr), isTrue); expect(decoration.hitTest(size, const Offset(990.0, 10.0), textDirection: TextDirection.ltr), isTrue);
}); });
test('BoxDecoration with LinearGradient using AlignmentDirectional', () {
const BoxDecoration decoration = const BoxDecoration(
color: const Color(0xFF000000),
gradient: const LinearGradient(
begin: AlignmentDirectional.centerStart,
end: AlignmentDirectional.bottomEnd,
colors: const<Color>[
const Color(0xFF000000),
const Color(0xFFFFFFFF),
],
),
);
final BoxPainter painter = decoration.createBoxPainter();
const Size size = const Size(1000.0, 1000.0);
expect(
(Canvas canvas) {
painter.paint(
canvas,
const Offset(0.0, 0.0),
const ImageConfiguration(size: size, textDirection: TextDirection.rtl),
);
},
paints..rect(rect: Offset.zero & size),
);
});
} }