Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

round subpixels up to next integer in measureText

Browse Source 
A common source of layout bugs we're seeing these days involves the
output of measureText() being fed into StaticLayout's constructor.
measureText() returns subpixel-accurate values, but StaticLayout only
takes integral bounds, resulting in the subpixel portion of the
bounds being truncated. This leaves StaticLayout with insufficient
space to layout the text that was just measured, causing all manner
of unexpected line breaks.

This could be causing issues elsewhere, as well. Until our text
pipeline is fully subpixel-perfect, it's best that measureText
guarantee that the value it returns will be sufficient to contain
the text, even if cast to int.

Bug: 8164205
Change-Id: Ib84947f0d0a1229287f5b19b99e7efd40f5317f7
This commit is contained in:
Victoria Lease
2013-02-26 11:18:42 -08:00
parent ebbf5a1ec4
commit ec8c16abfb
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
graphics/java/android/graphics/Paint.java
View File

@@ -1197,14 +1197,14 @@ public class Paint {
return 0f;
}
if (!mHasCompatScaling) {
return native_measureText(text, index, count);
return (float) Math.ceil(native_measureText(text, index, count));
}
final float oldSize = getTextSize();
setTextSize(oldSize*mCompatScaling);
float w = native_measureText(text, index, count);
setTextSize(oldSize);
return w*mInvCompatScaling;
return (float) Math.ceil(w*mInvCompatScaling);
}
private native float native_measureText(char[] text, int index, int count);
@@ -1229,14 +1229,14 @@ public class Paint {
return 0f;
}
if (!mHasCompatScaling) {
return native_measureText(text, start, end);
return (float) Math.ceil(native_measureText(text, start, end));
}
final float oldSize = getTextSize();
setTextSize(oldSize*mCompatScaling);
float w = native_measureText(text, start, end);
setTextSize(oldSize);
return w*mInvCompatScaling;
return (float) Math.ceil(w*mInvCompatScaling);
}
private native float native_measureText(String text, int start, int end);
@@ -1256,12 +1256,14 @@ public class Paint {
return 0f;
}
if (!mHasCompatScaling) return native_measureText(text);
if (!mHasCompatScaling) {
return (float) Math.ceil(native_measureText(text));
}
final float oldSize = getTextSize();
setTextSize(oldSize*mCompatScaling);
float w = native_measureText(text);
setTextSize(oldSize);
return w*mInvCompatScaling;
return (float) Math.ceil(w*mInvCompatScaling);
}
private native float native_measureText(String text);