diff options
| author | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 00:16:02 +0000 |
|---|---|---|
| committer | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 00:16:02 +0000 |
| commit | 6ef67bd346790a24d3d37b97172588d24e6d566e (patch) | |
| tree | 16aa0d13685758d1d6b2dae130e964639c846f78 /ui/views/view_text_utils.cc | |
| parent | 9ed25b4b4f6faafa69c5892ab940f511123f3833 (diff) | |
| download | chromium_src-6ef67bd346790a24d3d37b97172588d24e6d566e.zip chromium_src-6ef67bd346790a24d3d37b97172588d24e6d566e.tar.gz chromium_src-6ef67bd346790a24d3d37b97172588d24e6d566e.tar.bz2 | |
Fix about box text spacing on Windows.
This got broken by http://crrev.com/119967 but
was masked out by the use_canvas_skia_skia change.
The issue is that when MULTI_LINE was passed, the
canvas_skia_win.cc path does not count the trailing
space in the string width.
Since this code is doing the wrapping itself, it
should not be passing MULTI_LINE in the first place.
BUG=113744
TEST=Open about dialog on Windows and check that words
have spaces between them.
Review URL: http://codereview.chromium.org/9392007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121773 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/view_text_utils.cc')
| -rw-r--r-- | ui/views/view_text_utils.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/views/view_text_utils.cc b/ui/views/view_text_utils.cc index ce65c3c..41feef5 100644 --- a/ui/views/view_text_utils.cc +++ b/ui/views/view_text_utils.cc @@ -98,8 +98,7 @@ void DrawTextStartingFrom(gfx::Canvas* canvas, int flags = (text_direction_is_rtl ? gfx::Canvas::TEXT_ALIGN_RIGHT : gfx::Canvas::TEXT_ALIGN_LEFT); - flags |= gfx::Canvas::MULTI_LINE | gfx::Canvas::HIDE_PREFIX | - gfx::Canvas::NO_ELLIPSIS; + flags |= gfx::Canvas::HIDE_PREFIX | gfx::Canvas::NO_ELLIPSIS; // Iterate over each word in the text, or put in a more locale-neutral way: // iterate to the next line breaking opportunity. |