Layout avatar button

chrome/browser/ui/views/frame/glass_browser_frame_view.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/frame/glass_browser_frame_view.h"
 
 #include <dwmapi.h>
 #include <utility>
 
 #include "base/win/windows_version.h"
@@ skipping 31 matching lines @@
 namespace {
 // Thickness of the frame edge between the non-client area and the web content.
 const int kClientBorderThickness = 3;
 // Besides the frame border, there's empty space atop the window in restored
 // mode, to use to drag the window around.
 const int kNonClientRestoredExtraThickness = 11;
 // At the window corners the resize area is not actually bigger, but the 16
 // pixels at the end of the top and bottom edges trigger diagonal resizing.
 const int kResizeCornerWidth = 16;
 // How far the profile switcher button is from the left of the minimize button.
-const int kProfileSwitcherButtonOffset = 5;
+const int kProfileSwitcherButtonOffset = 1;
 // The content edge images have a shadow built into them.
 const int kContentEdgeShadowThickness = 2;
 // In restored mode, the New Tab button isn't at the same height as the caption
 // buttons, but the space will look cluttered if it actually slides under them,
 // so we stop it when the gap between the two is down to 5 px.
 const int kNewTabCaptionRestoredSpacing = 5;
 // In maximized mode, where the New Tab button and the caption buttons are at
 // similar vertical coordinates, we need to reserve a larger, 16 px gap to avoid
 // looking too cluttered.
 const int kNewTabCaptionMaximizedSpacing = 16;
-// Height of the profile switcher button. Same as the height of the Windows 7/8
-// caption buttons.
-// TODO(bsep): Windows 10 caption buttons look very different and we would like
-// the profile switcher button to match on that platform.
-const int kProfileSwitcherButtonHeight = 20;
+// Minimum and maximux width of the profile switcher button.
+const int kProfileSwitcherButtonMinWidth = 48;
+const int kProfileSwictherButtonMaxWidth = 96;
 // There is a small one-pixel strip right above the caption buttons in which the
 // resize border "peeks" through.
 const int kCaptionButtonTopInset = 1;
 
 // Converts the |image| to a Windows icon and returns the corresponding HICON
 // handle. |image| is resized to desired |width| and |height| if needed.
 base::win::ScopedHICON CreateHICONFromSkBitmapSizedTo(
     const gfx::ImageSkia& image,
     int width,
     int height) {
@@ skipping 69 matching lines @@
                            : kNewTabCaptionRestoredSpacing);
 
     // The profile switcher button is optionally displayed to the left of the
     // minimize button.
     if (profile_switcher_.view()) {
       const int old_end_x = end_x;
       end_x -= profile_switcher_.view()->width() + kProfileSwitcherButtonOffset;
 
       // In non-maximized mode, allow the new tab button to slide completely
       // under the profile switcher button.
-      if (!IsMaximized()) {
-        end_x = std::min(end_x + GetLayoutSize(NEW_TAB_BUTTON).width() +
-                             kNewTabCaptionRestoredSpacing,
-                         old_end_x);
-      }
+      //if (!IsMaximized()) {
+      //  end_x = std::min(end_x + GetLayoutSize(NEW_TAB_BUTTON).width() +
+      //                       kNewTabCaptionRestoredSpacing,
+      //                   old_end_x);
+      //}
     }
   }
   return gfx::Rect(x, TopAreaHeight(false), std::max(0, end_x - x),
                    tabstrip->GetPreferredSize().height());
 }
 
 int GlassBrowserFrameView::GetTopInset(bool restored) const {
   return GetClientAreaInsets(restored).top();
 }
 
@@ skipping 538 matching lines @@
                    color);
   side.set_x(right);
   canvas->FillRect(side, color);
 }
 
 void GlassBrowserFrameView::LayoutProfileSwitcher() {
   DCHECK(browser_view()->IsRegularOrGuestSession());
   if (!profile_switcher_.view())
     return;
 
-  gfx::Size label_size = profile_switcher_.view()->GetPreferredSize();
+  gfx::Size button_size = profile_switcher_.view()->GetPreferredSize();
+  int button_width = std::min(std::max(button_size.width(), kProfileSwitcherButtonMinWidth), kProfileSwictherButtonMaxWidth);
 
   int button_x;
   if (CaptionButtonsOnLeadingEdge()) {
     button_x = width() - frame()->GetMinimizeButtonOffset() +
                kProfileSwitcherButtonOffset;
   } else {
-    button_x =
-        MinimizeButtonX() - kProfileSwitcherButtonOffset - label_size.width();
+    button_x = MinimizeButtonX() - kProfileSwitcherButtonOffset - button_width;
   }
 
   int button_y = WindowTopY();
+  int button_height = frame()->GetMinimizeButtonHeight();
   if (IsMaximized()) {
     // In maximized mode the caption buttons appear only 19 pixels high, but
     // their contents are aligned as if they were 20 pixels high and extended
     // 1 pixel off the top of the screen. We position the profile switcher
     // button the same way to match.
-    button_y -= 1;
+    button_height -= 3;
   }
-  profile_switcher_.view()->SetBounds(button_x, button_y, label_size.width(),
-                                      kProfileSwitcherButtonHeight);
+  
+  profile_switcher_.view()->SetBounds(button_x, button_y, button_width, button_height);
+  //if (browser_view()->tabstrip()) {
+  //  LOG(ERROR) << "tabstrip->GetPreferredSize(): " << browser_view()->tabstrip()->GetPreferredSize().ToString();
+  //  gfx::Rect tabstrip_bounds = GetBoundsForTabStrip(browser_view()->tabstrip());
+  //  LOG(ERROR) << "tabstrip_bounds: " << tabstrip_bounds.ToString() << " - max_x" << browser_view()->tabstrip()->max_x();
+  //  LOG(ERROR) << "Profile Swicther Bounds: " << profile_switcher_.view()->GetMirroredBounds().ToString();
+  //  LOG(ERROR) << "--------";
+  //  if (browser_view()->tabstrip()->max_x() >= button_x) {
+  //    profile_switcher_.view()->SetBounds(button_x, button_y, button_width, 19);
+  //  }
+  //  }
+  LOG(ERROR) << "Minimize Button Bounds: " << minimize_button_->GetMirroredBounds().ToString();
+  LOG(ERROR) << "Profile Swicther Bounds: " << profile_switcher_.view()->GetMirroredBounds().ToString();
 }
 
 void GlassBrowserFrameView::LayoutIncognitoIcon() {
   const gfx::Size size(GetIncognitoAvatarIcon().size());
   int x = ClientBorderThickness(false);
   // In RTL, the icon needs to start after the caption buttons.
   if (CaptionButtonsOnLeadingEdge()) {
     x = width() - frame()->GetMinimizeButtonOffset() +
         (profile_switcher_.view() ? (profile_switcher_.view()->width() +
                                      kProfileSwitcherButtonOffset)
@@ skipping 161 matching lines @@
   static bool initialized = false;
   if (!initialized) {
     for (int i = 0; i < kThrobberIconCount; ++i) {
       throbber_icons_[i] =
           ui::LoadThemeIconFromResourcesDataDLL(IDI_THROBBER_01 + i);
       DCHECK(throbber_icons_[i]);
     }
     initialized = true;
   }
 }