summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorRaph Levien <raph@google.com>2014-06-05 22:40:15 -0700
committerRaph Levien <raph@google.com>2014-06-06 17:03:33 +0000
commit89566f0ada1cafe673efa064cde38467990235d4 (patch)
tree403c99ff42f53d7ad931a1c18fae32ace002a4fc /libs
parent621d437b92a63fe3cd80274bc25b549a2b0decb8 (diff)
downloadandroid_frameworks_minikin-89566f0ada1cafe673efa064cde38467990235d4.tar.gz
android_frameworks_minikin-89566f0ada1cafe673efa064cde38467990235d4.tar.bz2
android_frameworks_minikin-89566f0ada1cafe673efa064cde38467990235d4.zip
Add baseFont method to FontCollection
This patch adds a method to retrieve the base font from a FontCollection, which is useful when querying global font metrics. Part of the fix for bug 15467288 "Inconsistent line heights on Minikin builds" Change-Id: I268ae5128d0852a020d746bc22af81fc1a623228
Diffstat (limited to 'libs')
-rw-r--r--libs/minikin/FontCollection.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/libs/minikin/FontCollection.cpp b/libs/minikin/FontCollection.cpp
index 1713b47..c13670e 100644
--- a/libs/minikin/FontCollection.cpp
+++ b/libs/minikin/FontCollection.cpp
@@ -185,6 +185,14 @@ void FontCollection::itemize(const uint16_t *string, size_t string_size, FontSty
}
}
+MinikinFont* FontCollection::baseFont(FontStyle style) {
+ if (mInstances.empty()) {
+ return NULL;
+ }
+ return mInstances[0].mFamily->getClosestMatch(style);
+}
+
+
uint32_t FontCollection::getId() const {
return mId;
}