Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Expose font descent in Litho Text Spec #758

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Expose font descent in Litho Text Spec #758

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6f3607
Expose font descent in Litho Text Spec
edwardfoux Jan 21, 2021
ff970c7
add measuredLineDescent as an input parameter to onBoundDefined to ma…
edwardfoux Jan 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions litho-widget/src/main/java/com/facebook/litho/widget/TextSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,8 @@ static void onLoadStyle(
Output<Float> shadowDy,
Output<Integer> shadowColor,
Output<VerticalGravity> verticalGravity,
Output<Typeface> typeface) {
Output<Typeface> typeface,
Output<Float> measuredLineDescent) {

TextStylesHelper.onLoadStyle(
c,
Expand Down Expand Up @@ -369,9 +370,9 @@ static void onMeasure(
// Adjust height according to the minimum number of lines.
int preferredHeight = LayoutMeasureUtil.getHeight(newLayout);
final int lineCount = newLayout.getLineCount();
final TextPaint paint = newLayout.getPaint();
measuredLineDescent.set(paint.descent());
if (lineCount < minLines) {
final TextPaint paint = newLayout.getPaint();

final int layoutLineHeight =
Math.round(paint.getFontMetricsInt(null) * spacingMultiplier + extraSpacing);
preferredHeight += layoutLineHeight * (minLines - lineCount);
Expand Down Expand Up @@ -624,6 +625,7 @@ static void onBoundsDefined(
@FromMeasure Layout measureLayout,
@FromMeasure Integer measuredWidth,
@FromMeasure Integer measuredHeight,
@FromMeasure Float measuredLineDescent,
Output<CharSequence> processedText,
Output<Layout> textLayout,
Output<Float> textLayoutTranslationY,
Expand Down