Commit 538463e
authored
[Android] Fix Label with MaxLines truncating text in horizontal ScrollView (dotnet#34279)
> [!NOTE]
> Are you waiting for the changes in this PR to be merged?
> It would be very helpful if you could [test the resulting
artifacts](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from
this PR and let us know in a comment if this change resolves your issue.
Thank you!
### Root Cause
PR dotnet#33281 added a `GetDesiredSize()` override in
`LabelHandler.Android.cs` to fix issue dotnet#31782 (WordWrap labels reporting
full constraint width instead of actual text width). The fix computes
the longest wrapped line and returns that as the desired width.
This causes a regression when `MaxLines` is set on the label:
1. `GetDesiredSize()` is called at the full available width — text wraps
cleanly within MaxLines limit
2. The fix returns the shorter "longest line" width
3. The label is arranged at that narrower width
4. At the narrower width, the same text needs more lines — exceeding
MaxLines → text is clipped
### Description of Change
The `GetDesiredSize()` override now uses a double-measurement strategy:
1. **Entry guard**: Only applies the width-narrowing when `Ellipsize ==
null` (no active truncation).
2. **Compute candidate width**: Finds the widest rendered line as
before.
3. **Safety check** (only when `MaxLines` is explicitly set):
Re-measures the TextView at exactly the narrowed pixel width. If the
re-measurement shows the text would now exceed `MaxLines`, the original
full width is returned instead.
4. **Narrow when safe**: If the re-measurement confirms the same or
fewer lines, the narrowed width is returned — preserving the dotnet#31782
alignment fix even for labels with explicit `MaxLines`.
This avoids both regressions:
- Labels without `MaxLines` behave as before (alignment fix preserved,
no second measure).
- Labels with `MaxLines` that have line-count headroom also get the
alignment fix.
### Issues Fixed
Fixes dotnet#34120
### Tested platforms
- [x] Android
- [x] Windows
- [x] iOS
- [x] Mac
**Files Changed in this PR:**
| File | Change |
|------|--------|
| `src/Core/src/Handlers/Label/LabelHandler.Android.cs` |
Double-measurement fix (~20 lines) |
| `src/Controls/tests/TestCases.HostApp/Issues/Issue34120.cs` | New UI
test HostApp page |
| `src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue34120.cs`
| New NUnit UI test |
**Regression Reference:**
- Regressed by: PR dotnet#33281
- Introduced in: 10.0.40
- Works in: 10.0.30, 10.0.31
- Platform: Android only
### Screenshots
|Before|After|
|--|--|
|<img width="540" alt="image"
src="https://github.com/user-attachments/assets/4c365c06-6aa9-4471-9553-d46983ec66c7"
>|<img width="540" alt="image"
src="https://github.com/user-attachments/assets/d67723d9-fd79-4dcc-8451-f1537f8b3668"
>|1 parent 3e2acb4 commit 538463e
8 files changed
Lines changed: 132 additions & 1 deletion
File tree
- src
- Controls/tests
- TestCases.Android.Tests/snapshots/android
- TestCases.HostApp/Issues
- TestCases.Mac.Tests/snapshots/mac
- TestCases.WinUI.Tests/snapshots/windows
- TestCases.iOS.Tests/snapshots
- ios-26
- ios
- Core/src/Handlers/Label
Lines changed: 81 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
Lines changed: 21 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| 25 | + | |
| 26 | + | |
25 | 27 | | |
26 | 28 | | |
27 | | - | |
| 29 | + | |
| 30 | + | |
28 | 31 | | |
29 | 32 | | |
30 | 33 | | |
| |||
38 | 41 | | |
39 | 42 | | |
40 | 43 | | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
41 | 69 | | |
| 70 | + | |
42 | 71 | | |
43 | 72 | | |
44 | 73 | | |
| |||
0 commit comments