Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Side by Side Diff: ui/gfx/text_constants.h

Issue 2943823002: Remove gfx::DIAGONAL_STRIKE and supporting code. (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/gfx/render_text_unittest.cc ('k') | ui/views/examples/multiline_example.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_GFX_TEXT_CONSTANTS_H_ 5 #ifndef UI_GFX_TEXT_CONSTANTS_H_
6 #define UI_GFX_TEXT_CONSTANTS_H_ 6 #define UI_GFX_TEXT_CONSTANTS_H_
7 7
8 namespace gfx { 8 namespace gfx {
9 9
10 // TODO(msw): Distinguish between logical character stops and glyph stops? 10 // TODO(msw): Distinguish between logical character stops and glyph stops?
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 DIRECTIONALITY_FROM_UI, // Use the UI locale's text reading direction. 70 DIRECTIONALITY_FROM_UI, // Use the UI locale's text reading direction.
71 DIRECTIONALITY_FORCE_LTR, // Use LTR regardless of content or UI locale. 71 DIRECTIONALITY_FORCE_LTR, // Use LTR regardless of content or UI locale.
72 DIRECTIONALITY_FORCE_RTL, // Use RTL regardless of content or UI locale. 72 DIRECTIONALITY_FORCE_RTL, // Use RTL regardless of content or UI locale.
73 }; 73 };
74 74
75 // Text styles and adornments. 75 // Text styles and adornments.
76 // TODO(msw): Merge with gfx::Font::FontStyle. 76 // TODO(msw): Merge with gfx::Font::FontStyle.
77 enum TextStyle { 77 enum TextStyle {
78 ITALIC = 0, 78 ITALIC = 0,
79 STRIKE, 79 STRIKE,
80 DIAGONAL_STRIKE,
81 UNDERLINE, 80 UNDERLINE,
82 NUM_TEXT_STYLES, 81 NUM_TEXT_STYLES,
83 }; 82 };
84 83
85 // Text baseline offset types. 84 // Text baseline offset types.
86 // Figure of font metrics: 85 // Figure of font metrics:
87 // +--------+--------+------------------------+-------------+ 86 // +--------+--------+------------------------+-------------+
88 // | | | internal leading | SUPERSCRIPT | 87 // | | | internal leading | SUPERSCRIPT |
89 // | | +------------+-----------| | 88 // | | +------------+-----------| |
90 // | | ascent | | SUPERIOR |-------------+ 89 // | | ascent | | SUPERIOR |-------------+
(...skipping 17 matching lines...) Expand all
108 ELIDE_HEAD, // Add an ellipsis at the start of the string. 107 ELIDE_HEAD, // Add an ellipsis at the start of the string.
109 ELIDE_MIDDLE, // Add an ellipsis in the middle of the string. 108 ELIDE_MIDDLE, // Add an ellipsis in the middle of the string.
110 ELIDE_TAIL, // Add an ellipsis at the end of the string. 109 ELIDE_TAIL, // Add an ellipsis at the end of the string.
111 ELIDE_EMAIL, // Add ellipses to username and domain substrings. 110 ELIDE_EMAIL, // Add ellipses to username and domain substrings.
112 FADE_TAIL, // Fade the string's end opposite of its horizontal alignment. 111 FADE_TAIL, // Fade the string's end opposite of its horizontal alignment.
113 }; 112 };
114 113
115 } // namespace gfx 114 } // namespace gfx
116 115
117 #endif // UI_GFX_TEXT_CONSTANTS_H_ 116 #endif // UI_GFX_TEXT_CONSTANTS_H_
OLDNEW
« no previous file with comments | « ui/gfx/render_text_unittest.cc ('k') | ui/views/examples/multiline_example.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698