Adjust location of text in omnibox edit control for Metro.

chrome/browser/ui/views/omnibox/omnibox_view_win.cc

 // Copyright (c) 2012 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/browser/ui/views/omnibox/omnibox_view_win.h"
 
 #include <algorithm>
 #include <locale>
 #include <string>
 
@@ skipping 33 matching lines @@
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/drag_source.h"
 #include "ui/base/dragdrop/drop_target.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
 #include "ui/base/events.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
+#include "ui/base/scale.h"
 #include "ui/base/win/mouse_wheel_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/button_drag_utils.h"
 #include "ui/views/controls/menu/menu_2.h"
 #include "ui/views/controls/textfield/native_textfield_win.h"
 #include "ui/views/widget/widget.h"
 
 #pragma comment(lib, "oleacc.lib")  // Needed for accessibility support.
 #pragma comment(lib, "riched20.lib")  // Needed for the richedit control.
 
@@ skipping 433 matching lines @@
   GetTextMetrics(hdc, &tm);
   const float kXHeightRatio = 0.7f;  // The ratio of a font's x-height to its
                                      // cap height.  Sadly, Windows doesn't
                                      // provide a true value for a font's
                                      // x-height in its text metrics, so we
                                      // approximate.
   font_x_height_ = static_cast<int>((static_cast<float>(font_.GetBaseline() -
       tm.tmInternalLeading) * kXHeightRatio) + 0.5);
   // The distance from the top of the field to the desired baseline of the
   // rendered text.
-  const int kTextBaseline = popup_window_mode_ ? 15 : 18;
-  font_y_adjustment_ = kTextBaseline - font_.GetBaseline();
+  int text_baseline = popup_window_mode_ ? 15 : 18;
+  switch (ui::GetDisplayScale()) {
+    case ui::SCALE_METRO_100:
+    case ui::SCALE_METRO_140:
+    case ui::SCALE_METRO_180:
+      // TODO(joi): Metro scales other than 100% will probably need a
+      // different value.
+      text_baseline = 21;

[Peter Kasting, 2012/04/19 17:39:55]

If I understand correctly, this is because in metro mode you're changing the
height of the whole omnibox to be bigger, right?

If so, I don't think this is the right way to do this change.  We should be able
to ask some other object how tall the omnibox is and then calculate the desired
baseline as either a fraction of that height or an offset from the top or bottom
(probably the former).  Maybe we can do this by checking our own height, or else
we could look at the height of |parent_view|.

This will also help if you decide to make metro-mode popup windows have a
different omnibox than non-popups, just as we currently do for non-metro-mode.

+      break;
+    default:
+      // Leave the default as calculated above.
+      break;
+  }
+  font_y_adjustment_ = text_baseline - font_.GetBaseline();
 
   // Get the number of twips per pixel, which we need below to offset our text
   // by the desired number of pixels.
   const long kTwipsPerPixel = kTwipsPerInch / GetDeviceCaps(hdc, LOGPIXELSY);
   // It's unsafe to delete a DC with a non-stock object selected, so restore the
   // original font.
   SelectObject(hdc, old_font);
   ::ReleaseDC(NULL, hdc);
 
   // Set the default character style -- adjust to our desired baseline.
@@ skipping 2194 matching lines @@
     bool popup_window_mode,
     LocationBarView* location_bar) {
   return new OmniboxViewWin(controller,
                             toolbar_model,
                             location_bar,
                             command_updater,
                             popup_window_mode,
                             location_bar);
 }
 #endif