Index: ui/gfx/font_list.h |
diff --git a/ui/gfx/font_list.h b/ui/gfx/font_list.h |
index 1ba8ad1aff9f0511bcf3c17421f15655766e14f1..6db0287b947e4e83537e610b30a81d2331c3c561 100644 |
--- a/ui/gfx/font_list.h |
+++ b/ui/gfx/font_list.h |
@@ -83,6 +83,31 @@ class GFX_EXPORT FontList { |
// values: Font::BOLD, Font::ITALIC and Font::UNDERLINE. |
FontList DeriveWithStyle(int font_style) const; |
+ // Given a containing |height| shrinks the font size until the font list |
msw
2014/08/29 17:25:59
nit: Remove "Given a containing |height| "
noms (inactive)
2014/08/29 18:03:20
Done. Did some minor rewording to match the other
|
+ // will fit within |height| while having its cap height vertically centered. |
+ // Returns the correctly-sized font list. |
+ // |
+ // The expected layout: |
+ // +--------+-----------------------------------------------+------------+ |
+ // | | y offset | space | |
+ // | +--------+-------------------+------------------+ above | |
+ // | | | | internal leading | cap height | |
+ // | box | font | ascent (baseline) +------------------+------------+ |
+ // | height | height | | cap height | |
+ // | | |-------------------+------------------+------------+ |
+ // | | | descent (height - baseline) | space | |
+ // | +--------+--------------------------------------+ below | |
+ // | | space at bottom | cap height | |
+ // +--------+-----------------------------------------------+------------+ |
+ // Goal: |
+ // center of box height == center of cap height |
+ // (i.e. space above cap height == space below cap height) |
+ // Restrictions: |
+ // y offset >= 0 |
+ // space at bottom >= 0 |
+ // (i.e. Entire font must be visible inside the box.) |
+ gfx::FontList DeriveWithHeightUpperBound(int height) const; |
+ |
// Returns the height of this font list, which is max(ascent) + max(descent) |
// for all the fonts in the font list. |
int GetHeight() const; |