diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-16 07:58:54 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-16 07:58:54 +0000 |
| commit | 9724f0718addde1481cee23fdebe16937817aa96 (patch) | |
| tree | 0ea82350657502982a7d6d6c68ec3783bc498a83 /views | |
| parent | 0fff018f2f765fceb61ef98b57b59e2cdda5c77b (diff) | |
| download | chromium_src-9724f0718addde1481cee23fdebe16937817aa96.zip chromium_src-9724f0718addde1481cee23fdebe16937817aa96.tar.gz chromium_src-9724f0718addde1481cee23fdebe16937817aa96.tar.bz2 | |
Reverted 29258.
TBR: nick@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/window/window.cc | 33 | ||||
| -rw-r--r-- | views/window/window.h | 10 |
2 files changed, 40 insertions, 3 deletions
diff --git a/views/window/window.cc b/views/window/window.cc index 18b4d51..9f69172 100644 --- a/views/window/window.cc +++ b/views/window/window.cc @@ -5,7 +5,7 @@ #include "views/window/window.h" #include "app/gfx/font.h" -#include "app/gfx/font_util.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/size.h" #include "base/string_util.h" @@ -14,17 +14,44 @@ namespace views { // static +int Window::GetLocalizedContentsWidthForFont(int col_resource_id, + const gfx::Font& font) { + double chars = 0; + StringToDouble(WideToUTF8(l10n_util::GetString(col_resource_id)), &chars); + int width = font.GetExpectedTextWidth(static_cast<int>(chars)); + DCHECK(width > 0); + return width; +} + +// static int Window::GetLocalizedContentsWidth(int col_resource_id) { - return gfx::GetLocalizedContentsWidthForFont(col_resource_id, + return GetLocalizedContentsWidthForFont(col_resource_id, ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont)); } // static +int Window::GetLocalizedContentsHeightForFont(int row_resource_id, + const gfx::Font& font) { + double lines = 0; + StringToDouble(WideToUTF8(l10n_util::GetString(row_resource_id)), &lines); + int height = static_cast<int>(font.height() * lines); + DCHECK(height > 0); + return height; +} + +// static int Window::GetLocalizedContentsHeight(int row_resource_id) { - return gfx::GetLocalizedContentsHeightForFont(row_resource_id, + return GetLocalizedContentsHeightForFont(row_resource_id, ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont)); } +gfx::Size Window::GetLocalizedContentsSizeForFont(int col_resource_id, + int row_resource_id, + const gfx::Font& font) { + return gfx::Size(GetLocalizedContentsWidthForFont(col_resource_id, font), + GetLocalizedContentsHeightForFont(row_resource_id, font)); +} + // static gfx::Size Window::GetLocalizedContentsSize(int col_resource_id, int row_resource_id) { diff --git a/views/window/window.h b/views/window/window.h index becb8d0..f2f9e34 100644 --- a/views/window/window.h +++ b/views/window/window.h @@ -43,6 +43,16 @@ class Window { static gfx::Size GetLocalizedContentsSize(int col_resource_id, int row_resource_id); + // These versions of GetLocalizedContents allow a font to be specified + // other than the default UI font. + static int GetLocalizedContentsWidthForFont(int col_resource_id, + const gfx::Font& font); + static int GetLocalizedContentsHeightForFont(int row_resource_id, + const gfx::Font& font); + static gfx::Size GetLocalizedContentsSizeForFont(int col_resource_id, + int row_resource_id, + const gfx::Font& font); + // Closes all windows that aren't identified as "app windows" via // IsAppWindow. Called during application shutdown when the last "app window" // is closed. |