diff --git a/lib/widgets/mesh_ui.dart b/lib/widgets/mesh_ui.dart index b9492d82..8bef6c59 100644 --- a/lib/widgets/mesh_ui.dart +++ b/lib/widgets/mesh_ui.dart @@ -893,12 +893,15 @@ class _RenderSegmentLabel extends RenderBox { TextStyle _style; set style(TextStyle value) { if (value == _style) return; - final relayout = - value.compareTo(_style).index > RenderComparison.paint.index; _style = value; - relayout ? markNeedsLayout() : markNeedsPaint(); + // Layout even for a colour-only change: the painter takes the new style + // (the selected or disabled colour) in _fit, not in paint. + markNeedsLayout(); } + @visibleForTesting + Color? get debugPaintedColor => _painter.text?.style?.color; + TextScaler _textScaler; set textScaler(TextScaler value) { if (value == _textScaler) return; diff --git a/test/widgets/mesh_segment_label_test.dart b/test/widgets/mesh_segment_label_test.dart index 6eb8ccd9..c37864da 100644 --- a/test/widgets/mesh_segment_label_test.dart +++ b/test/widgets/mesh_segment_label_test.dart @@ -54,4 +54,26 @@ void main() { expect(box.size.width, lessThanOrEqualTo(parent.size.width)); } }); + + testWidgets('a colour-only style change reaches the painted text', ( + tester, + ) async { + Widget label(Color color) => MaterialApp( + home: Center( + child: DefaultTextStyle( + style: TextStyle(fontSize: 14, color: color), + child: const MeshSegmentLabel('Flood'), + ), + ), + ); + Color? painted() => + (tester.renderObject(find.byType(MeshSegmentLabel)) as dynamic) + .debugPaintedColor + as Color?; + + await tester.pumpWidget(label(const Color(0xFF112233))); + expect(painted(), const Color(0xFF112233)); + await tester.pumpWidget(label(const Color(0xFFEEDDCC))); + expect(painted(), const Color(0xFFEEDDCC)); + }); }