From 7d7b882f49e7c33e1ad7b113234fd6af94fac608 Mon Sep 17 00:00:00 2001 From: "jshin@chromium.org" Date: Tue, 14 Jul 2009 22:04:17 +0000 Subject: Make native_menu_win be 'owner_drawn' when the UI font/size is overriden for Indian languages. This is a regression with a new menu implementation. BUG=7319 (http://crbug.com/7319 ) TEST=Run Chrome with --lang=ml or --lang=bn and see if labels in PageMenu or AppMenu are readable. Review URL: http://codereview.chromium.org/155403 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20675 0039d316-1c4b-4281-b951-d872f2087c98 --- views/controls/menu/native_menu_win.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'views') diff --git a/views/controls/menu/native_menu_win.cc b/views/controls/menu/native_menu_win.cc index 8de7621..1de2f4f 100644 --- a/views/controls/menu/native_menu_win.cc +++ b/views/controls/menu/native_menu_win.cc @@ -302,7 +302,7 @@ const wchar_t* NativeMenuWin::MenuHostWindow::kMenuHostWindowKey = NativeMenuWin::NativeMenuWin(Menu2Model* model, HWND system_menu_for) : model_(model), menu_(NULL), - owner_draw_(false), + owner_draw_(l10n_util::NeedOverrideDefaultUIFont(NULL, NULL)), system_menu_for_(system_menu_for), first_item_index_(0) { } @@ -332,7 +332,7 @@ void NativeMenuWin::CancelMenu() { void NativeMenuWin::Rebuild() { ResetNativeMenu(); - owner_draw_ = model_->HasIcons(); + owner_draw_ = model_->HasIcons() || owner_draw_; first_item_index_ = model_->GetFirstItemIndex(GetNativeMenu()); for (int menu_index = first_item_index_; menu_index < first_item_index_ + model_->GetItemCount(); ++menu_index) { -- cgit v1.1