Improved OTR avatar and popup window rendering.

chrome/browser/views/location_bar_view.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/browser/views/location_bar_view.h"
 
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/app/theme/theme_resources.h"
@@ skipping 15 matching lines @@
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/background.h"
 #include "chrome/views/border.h"
 #include "chrome/views/root_view.h"
 #include "chrome/views/widget.h"
 #include "generated_resources.h"
 
 using views::View;
 
-const int LocationBarView::kTextVertMargin = 2;
+const int LocationBarView::kVertMargin = 2;
 
 const COLORREF LocationBarView::kBackgroundColorByLevel[] = {
   RGB(255, 245, 195),  // SecurityLevel SECURE: Yellow.
   RGB(255, 255, 255),  // SecurityLevel NORMAL: White.
   RGB(255, 255, 255),  // SecurityLevel INSECURE: White.
 };
 
-// The margins around the solid color we draw.
-static const int kBackgroundVertMargin = 2;
-static const int kBackgroundHoriMargin = 0;
-
 // Padding on the right and left of the entry field.
 static const int kEntryPadding = 3;
 
 // Padding between the entry and the leading/trailing views.
 static const int kInnerPadding = 3;
 
 static const SkBitmap* kBackground = NULL;
 
 static const SkBitmap* kPopupBackground = NULL;
-static const int kPopupBackgroundVertMargin = 2;
 
 // The delay the mouse has to be hovering over the lock/warning icon before the
 // info bubble is shown.
 static const int kInfoBubbleHoverDelayMs = 500;
 
 // The tab key image.
 static const SkBitmap* kTabButtonBitmap = NULL;
 
 // Returns the description for a keyword.
 static std::wstring GetKeywordDescription(Profile* profile,
@@ skipping 123 matching lines @@
     profile_ = profile;
     location_entry_->model()->SetProfile(profile);
     selected_keyword_view_.set_profile(profile);
     keyword_hint_view_.set_profile(profile);
     security_image_view_.set_profile(profile);
   }
 }
 
 gfx::Size LocationBarView::GetPreferredSize() {
   return gfx::Size(0,
-      std::max((popup_window_mode_ ? kPopupBackground : kBackground)->height(),
-               security_image_view_.GetPreferredSize().height()));
+      (popup_window_mode_ ? kPopupBackground : kBackground)->height() -
+      TopOffset());
 }
 
 void LocationBarView::Layout() {
   DoLayout(true);
 }
 
 void LocationBarView::Paint(ChromeCanvas* canvas) {
   View::Paint(canvas);
 
   SkColor bg = SkColorSetRGB(
       GetRValue(kBackgroundColorByLevel[model_->GetSchemeSecurityLevel()]),
       GetGValue(kBackgroundColorByLevel[model_->GetSchemeSecurityLevel()]),
       GetBValue(kBackgroundColorByLevel[model_->GetSchemeSecurityLevel()]));
 
-  if (popup_window_mode_) {
-    canvas->TileImageInt(*kPopupBackground, 0, 0, width(),
-                         kPopupBackground->height());
-    canvas->FillRectInt(bg, 0, kPopupBackgroundVertMargin, width(),
-        kPopupBackground->height() - (kPopupBackgroundVertMargin * 2));
-  } else {
-    int bh = kBackground->height();
-    canvas->TileImageInt(*kBackground, 0, (height() - bh) / 2, width(),
-                         bh);
-    canvas->FillRectInt(bg, kBackgroundHoriMargin, kBackgroundVertMargin,
-                        width() - 2 * kBackgroundHoriMargin,
-                        bh - kBackgroundVertMargin * 2);
-  }
+  const SkBitmap* background =
+      popup_window_mode_ ? kPopupBackground : kBackground;
+  int top_offset = TopOffset();
+  canvas->TileImageInt(*background, 0, top_offset, 0, 0, width(), height());
+  int top_margin = TopMargin();
+  canvas->FillRectInt(bg, 0, top_margin, width(),
+                      height() - top_margin - kVertMargin);
 }
 
 bool LocationBarView::CanProcessTabKeyEvents() {
   // We want to receive tab key events when the hint is showing.
   return keyword_hint_view_.IsVisible();
 }
 
 void LocationBarView::VisibleBoundsInRootChanged() {
   location_entry_->ClosePopup();
 }
@@ skipping 93 matching lines @@
 
 void LocationBarView::DoLayout(const bool force_layout) {
   if (!location_entry_.get())
     return;
 
   RECT formatting_rect;
   location_entry_->GetRect(&formatting_rect);
   RECT edit_bounds;
   location_entry_->GetClientRect(&edit_bounds);
 
-  int entry_width = width() - kEntryPadding - kEntryPadding;
+  int entry_width = width() - (kEntryPadding * 2);
   gfx::Size security_image_size;
   if (security_image_view_.IsVisible()) {
     security_image_size = security_image_view_.GetPreferredSize();
     entry_width -= security_image_size.width();
   }
   gfx::Size info_label_size;
   if (info_label_.IsVisible()) {
     info_label_size = info_label_.GetPreferredSize();
     entry_width -= (info_label_size.width() + kInnerPadding);
   }
 
   const int max_edit_width = entry_width - formatting_rect.left -
                              (edit_bounds.right - formatting_rect.right);
   if (max_edit_width < 0)
     return;
   const int text_width = TextDisplayWidth();
   bool needs_layout = force_layout;
   needs_layout |= AdjustHints(text_width, max_edit_width);
 
   if (!needs_layout)
     return;
 
   // TODO(sky): baseline layout.
-  const SkBitmap* background =
-      popup_window_mode_ ? kPopupBackground : kBackground;
-  int bh = background->height();
-  int location_y = ((height() - bh) / 2) + kTextVertMargin;
-  int location_height = bh - (2 * kTextVertMargin);
+  int location_y = TopMargin();
+  int location_height = height() - location_y - kVertMargin;
   if (info_label_.IsVisible()) {
     info_label_.SetBounds(width() - kEntryPadding - info_label_size.width(),
                           location_y,
                           info_label_size.width(), location_height);
   }
   if (security_image_view_.IsVisible()) {
     const int info_label_width = info_label_size.width() ?
         info_label_size.width() + kInnerPadding : 0;
-    security_image_view_.SetBounds(width() - kEntryPadding -
-                                      info_label_width  -
-                                      security_image_size.width(),
-                                   location_y,
-                                   security_image_size.width(), location_height);
+    security_image_view_.SetBounds(width() - kEntryPadding - info_label_width -
+        security_image_size.width(), location_y, security_image_size.width(),
+        location_height);
   }
   gfx::Rect location_bounds(kEntryPadding, location_y, entry_width,
                             location_height);
   if (selected_keyword_view_.IsVisible()) {
     LayoutView(true, &selected_keyword_view_, text_width, max_edit_width,
                &location_bounds);
   } else if (keyword_hint_view_.IsVisible()) {
     LayoutView(false, &keyword_hint_view_, text_width, max_edit_width,
                &location_bounds);
   } else if (type_to_search_view_.IsVisible()) {
     LayoutView(false, &type_to_search_view_, text_width, max_edit_width,
                &location_bounds);
   }
 
   location_entry_view_->SetBounds(location_bounds.x(),
                                   location_bounds.y(),
                                   location_bounds.width(),
                                   location_bounds.height());
   if (!force_layout) {
     // If force_layout is false and we got this far it means one of the views
     // was added/removed or changed in size. We need to paint ourselves.
     SchedulePaint();
   }
 }
 
+int LocationBarView::TopOffset() const {
+  return (popup_window_mode_ && win_util::ShouldUseVistaFrame()) ? 1 : 0;
+}
+
+int LocationBarView::TopMargin() const {
+  return kVertMargin - TopOffset();
+}
+
 int LocationBarView::TextDisplayWidth() {
   POINT last_char_position =
       location_entry_->PosFromChar(location_entry_->GetTextLength());
   POINT scroll_position;
   location_entry_->GetScrollPos(&scroll_position);
   const int position_x = last_char_position.x + scroll_position.x;
   return UILayoutIsRightToLeft() ? width() - position_x : position_x;
 }
 
 bool LocationBarView::UsePref(int pref_width, int text_width, int max_width) {
@@ skipping 582 matching lines @@
 }
 
 void LocationBarView::FocusSearch() {
   location_entry_->SetUserText(L"?");
   location_entry_->SetFocus();
 }
 
 void LocationBarView::SaveStateToContents(TabContents* contents) {
   location_entry_->SaveStateToTab(contents);
 }