UI font localization part 2

chrome/views/controls/menu/menu.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/views/controls/menu/menu.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlwin.h>
 #include <atlcrack.h>
@@ skipping 94 matching lines @@
 
   void OnMeasureItem(WPARAM w_param, MEASUREITEMSTRUCT* lpmis) {
     Menu::ItemData* data = reinterpret_cast<Menu::ItemData*>(lpmis->itemData);
     if (data != NULL) {
       ChromeFont font;
       lpmis->itemWidth = font.GetStringWidth(data->label) + kIconWidth +
           kItemLeftMargin + kItemRightMargin -
           GetSystemMetrics(SM_CXMENUCHECK);
       if (data->submenu)
         lpmis->itemWidth += kArrowWidth;
+      // If the label contains an accelerator, make room for tab.
+      if (data->label.find(L'\t') != std::wstring::npos)
+        lpmis->itemWidth += font.GetStringWidth(L" ");
       lpmis->itemHeight = font.height() + kItemBottomMargin + kItemTopMargin;
     } else {
       // Measure separator size.
       lpmis->itemHeight = GetSystemMetrics(SM_CYMENU) / 2;
       lpmis->itemWidth = 0;
     }
   }
 
   void OnDrawItem(UINT wParam, DRAWITEMSTRUCT* lpdis) {
     HDC hDC = lpdis->hDC;
     COLORREF prev_bg_color, prev_text_color;
 
     // Set background color and text color
     if (lpdis->itemState & ODS_SELECTED) {
       prev_bg_color = SetBkColor(hDC, GetSysColor(COLOR_HIGHLIGHT));
       prev_text_color = SetTextColor(hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
     } else {
       prev_bg_color = SetBkColor(hDC, GetSysColor(COLOR_MENU));
       if (lpdis->itemState & ODS_DISABLED)
         prev_text_color = SetTextColor(hDC, GetSysColor(COLOR_GRAYTEXT));
       else
         prev_text_color = SetTextColor(hDC, GetSysColor(COLOR_MENUTEXT));
     }
 
     if (lpdis->itemData) {
       Menu::ItemData* data =
           reinterpret_cast<Menu::ItemData*>(lpdis->itemData);
-      wchar_t* str = const_cast<wchar_t*>(data->label.c_str());
 
       // Draw the background.
       HBRUSH hbr = CreateSolidBrush(GetBkColor(hDC));
       FillRect(hDC, &lpdis->rcItem, hbr);
       DeleteObject(hbr);
 
       // Draw the label.
       RECT rect = lpdis->rcItem;
       rect.top += kItemTopMargin;
+      // Should we add kIconWidth only when icon.width() != 0 ? 
       rect.left += kItemLeftMargin + kIconWidth;
-      UINT format = DT_TOP | DT_LEFT | DT_SINGLELINE;
+      rect.right -= kItemRightMargin;
+      UINT format = DT_TOP | DT_SINGLELINE;
       // Check whether the mnemonics should be underlined.
       BOOL underline_mnemonics;
       SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &underline_mnemonics, 0);
       if (!underline_mnemonics)
         format |= DT_HIDEPREFIX;
-      DrawTextEx(hDC, str, static_cast<int>(data->label.size()),
-                 &rect, format, NULL);
+      ChromeFont font;
+      HGDIOBJ old_font = static_cast<HFONT>(SelectObject(hDC, font.hfont()));
+      int fontsize = font.FontSize();
+
+      // If an accelerator is specified (with a tab delimiting the rest
+      // of the label from the accelerator), we have to justify 
+      // the fist part on the left and the accelerator on the right. 
+      // TODO(jungshik):  This will break in RTL UI. Currently, he/ar
+      // use the window system UI font and will not hit here. 
+      std::wstring label = data->label;
+      std::wstring accel;
+      std::wstring::size_type tab_pos = label.find(L'\t');
+      if (tab_pos != std::wstring::npos) {
+        accel = label.substr(tab_pos);
+        label = label.substr(0, tab_pos);
+      }
+      DrawTextEx(hDC, const_cast<wchar_t*>(label.data()),
+                 static_cast<int>(label.size()), &rect, format | DT_LEFT, NULL);
+      if (!accel.empty())
+        DrawTextEx(hDC, const_cast<wchar_t*>(accel.data()),
+                   static_cast<int>(accel.size()), &rect,
+                   format | DT_RIGHT, NULL);
+      SelectObject(hDC, old_font);
 
       // Draw the icon after the label, otherwise it would be covered
       // by the label.
       if (data->icon.width() != 0 && data->icon.height() != 0) {
         ChromeCanvas canvas(data->icon.width(), data->icon.height(), false);
         canvas.drawColor(SK_ColorBLACK, SkPorterDuff::kClear_Mode);
         canvas.DrawBitmapInt(data->icon, 0, 0);
         canvas.getTopPlatformDevice().drawToHDC(hDC, lpdis->rcItem.left +
             kItemLeftMargin, lpdis->rcItem.top + (lpdis->rcItem.bottom -
                 lpdis->rcItem.top - data->icon.height()) / 2, NULL);
@@ skipping 41 matching lines @@
     kEmptyIcon = new SkBitmap();
   return *kEmptyIcon;
 }
 
 Menu::Menu(Delegate* delegate, AnchorPoint anchor, HWND owner)
     : delegate_(delegate),
       menu_(CreatePopupMenu()),
       anchor_(anchor),
       owner_(owner),
       is_menu_visible_(false),
-      owner_draw_(false) {
+      owner_draw_(l10n_util::NeedOverrideDefaultUIFont(NULL, NULL)) {
   DCHECK(delegate_);
 }
 
 Menu::Menu(Menu* parent)
     : delegate_(parent->delegate_),
       menu_(CreatePopupMenu()),
       anchor_(parent->anchor_),
       owner_(parent->owner_),
       is_menu_visible_(false),
-      owner_draw_(false) {
+      owner_draw_(parent->owner_draw_) {
 }
 
 Menu::Menu(HMENU hmenu)
     : delegate_(NULL),
       menu_(hmenu),
       anchor_(TOPLEFT),
       owner_(NULL),
       is_menu_visible_(false),
       owner_draw_(false) {
   DCHECK(menu_);
@@ skipping 340 matching lines @@
 }
 
 void Menu::Cancel() {
   DCHECK(is_menu_visible_);
   EndMenu();
 }
 
 int Menu::ItemCount() {
   return GetMenuItemCount(menu_);
 }