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

Label should always be aligned with text in filled input decoration (#115540)

Browse Source 
Co-authored-by: Qun Cheng <quncheng@google.com>
This commit is contained in:
Qun Cheng 2022-11-17 10:27:53 -08:00 committed by GitHub
parent 31f8631627
commit a1ea383fa5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/flutter/lib/src/material/input_decorator.dart
View File

@ -1555,14 +1555,14 @@ class _RenderDecoration extends RenderBox with SlottedContainerRenderObjectMixin
case TextDirection.rtl: // origin is on the right case TextDirection.rtl: // origin is on the right
startX = labelOffset.dx + labelWidth * (1.0 - scale); startX = labelOffset.dx + labelWidth * (1.0 - scale);
floatStartX = startX; floatStartX = startX;
if (prefixIcon != null && !decoration.alignLabelWithHint) { if (prefixIcon != null && !decoration.alignLabelWithHint && isOutlineBorder) {
floatStartX += material3 ? _boxSize(prefixIcon).width - contentPadding.left : 0.0; floatStartX += material3 ? _boxSize(prefixIcon).width - contentPadding.left : 0.0;
} }
break; break;
case TextDirection.ltr: // origin on the left case TextDirection.ltr: // origin on the left
startX = labelOffset.dx; startX = labelOffset.dx;
floatStartX = startX; floatStartX = startX;
if (prefixIcon != null && !decoration.alignLabelWithHint) { if (prefixIcon != null && !decoration.alignLabelWithHint && isOutlineBorder) {
floatStartX += material3 ? -_boxSize(prefixIcon).width + contentPadding.left : 0.0; floatStartX += material3 ? -_boxSize(prefixIcon).width + contentPadding.left : 0.0;
} }
break; break;

19
packages/flutter/test/material/input_decorator_test.dart
View File

@ -2842,6 +2842,25 @@ void main() {
expect(tester.getBottomLeft(find.text('text')).dx, 48.0); expect(tester.getBottomLeft(find.text('text')).dx, 48.0);
expect(getBorderWeight(tester), 2.0); expect(getBorderWeight(tester), 2.0);
}); });
testWidgets('Floating label for filled input decoration is aligned with text', (WidgetTester tester) async {
await tester.pumpWidget(
buildInputDecorator(
useMaterial3: useMaterial3,
decoration: const InputDecoration(
prefixIcon: Icon(Icons.ac_unit),
labelText: 'label',
filled: true,
),
isFocused: true,
),
);
expect(tester.getSize(find.byType(InputDecorator)), const Size(800.0, 56.0));
expect(tester.getTopLeft(find.text('label')).dx, 48.0);
expect(tester.getBottomLeft(find.text('text')).dx, 48.0);
expect(getBorderWeight(tester), 2.0);
});
}); });
group('3 point interpolation alignment', () { group('3 point interpolation alignment', () {