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

Side by Side Diff: ui/gfx/text_utils_ios.mm

Issue 24883002: Uses and returns the fractional width in text eliding (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix per feedbacks Created 7 years, 2 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "ui/gfx/text_utils.h" 5 #include "ui/gfx/text_utils.h"
6 6
7 #import <UIKit/UIKit.h> 7 #import <UIKit/UIKit.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 10
11 #include "base/strings/sys_string_conversions.h" 11 #include "base/strings/sys_string_conversions.h"
12 #include "ui/gfx/font_list.h" 12 #include "ui/gfx/font_list.h"
13 13
14 namespace gfx { 14 namespace gfx {
15 15
16 int GetStringWidth(const base::string16& text, const FontList& font_list) { 16 int GetStringWidth(const base::string16& text, const FontList& font_list) {
17 return std::ceil(GetStringWidthF(text, font_list));
18 }
19
20 float GetStringWidthF(const base::string16& text, const FontList& font_list) {
17 NSString* ns_text = base::SysUTF16ToNSString(text); 21 NSString* ns_text = base::SysUTF16ToNSString(text);
18 NativeFont native_font = font_list.GetPrimaryFont().GetNativeFont(); 22 NativeFont native_font = font_list.GetPrimaryFont().GetNativeFont();
19 return std::ceil([ns_text sizeWithFont:native_font].width); 23 return [ns_text sizeWithFont:native_font].width;
20 } 24 }
21 25
22 } // namespace gfx 26 } // namespace gfx
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698