Fix some of the most egregious problems with Aero glass frames. These change...

chrome/browser/views/frame/aero_glass_frame.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/frame/aero_glass_frame.h"
 
 #include <dwmapi.h>
 
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/frame/aero_glass_non_client_view.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/window_delegate.h"
 
 // static
 
 // The width of the sizing borders.
 static const int kResizeBorder = 8;
+// The width of the client edge to the left and right of the window.
+static const int kWindowHorizontalClientEdgeWidth = 3;
+// The height of the client edge to the bottom of the window.
+static const int kWindowBottomClientEdgeHeight = 2;
 // By how much the toolbar overlaps with the tab strip.
 static const int kToolbarOverlapVertOffset = 5;
-// This is the width of the default client edge provided by Windows. In some
-// circumstances we provide our own client edge, so we use this width to
-// remove it.
-static const int kWindowsDWMBevelSize = 2;
 
 HICON AeroGlassFrame::throbber_icons_[AeroGlassFrame::kThrobberIconCount];
 
 ///////////////////////////////////////////////////////////////////////////////
 // AeroGlassFrame, public:
 
 AeroGlassFrame::AeroGlassFrame(BrowserView* browser_view)
     : Window(browser_view),
       browser_view_(browser_view),
       frame_initialized_(false),
@@ skipping 93 matching lines @@
   if (browser_view_->ActivateAppModalDialog())
     return TRUE;
 
   if (!frame_initialized_) {
     ::SetWindowPos(GetHWND(), NULL, 0, 0, 0, 0,
                    SWP_NOSIZE | SWP_NOMOVE | SWP_FRAMECHANGED);
     UpdateDWMFrame();
     frame_initialized_ = true;
   }
   browser_view_->ActivationChanged(!!active);
+  SetMsgHandled(false);
   return TRUE;
 }
 
 LRESULT AeroGlassFrame::OnNCCalcSize(BOOL mode, LPARAM l_param) {
   // By default the client side is set to the window size which is what
   // we want.
   if (browser_view_->IsToolbarVisible() && mode == TRUE) {
     // To be on the safe side and avoid side-effects, we only adjust the client
     // size to non-standard values when we must - i.e. when we're showing a
     // TabStrip.
     if (browser_view_->IsTabStripVisible()) {
       // Calculate new NCCALCSIZE_PARAMS based on custom NCA inset.
       NCCALCSIZE_PARAMS* params = reinterpret_cast<NCCALCSIZE_PARAMS*>(l_param);
 
       // Hack necessary to stop black background flicker, we cut out
       // resizeborder here to save us from having to do too much
       // addition and subtraction in Layout(). We don't cut off the
       // top + titlebar as that prevents the window controls from
       // highlighting.
-      params->rgrc[0].left += kResizeBorder;
-      params->rgrc[0].right -= kResizeBorder;
-      params->rgrc[0].bottom -= kResizeBorder;
+      params->rgrc[0].left +=
+          (kResizeBorder - kWindowHorizontalClientEdgeWidth);
+      params->rgrc[0].right -=
+          (kResizeBorder - kWindowHorizontalClientEdgeWidth);
+      params->rgrc[0].bottom -=
+          (kResizeBorder - kWindowBottomClientEdgeHeight);
 
       SetMsgHandled(TRUE);
     } else {
       // We don't adjust the client size for detached popups, so we need to
       // tell Windows we didn't handle the message here so that it doesn't
       // screw up the non-client area.
       SetMsgHandled(FALSE);
     }
 
     // We need to reset the frame, as Vista resets it whenever it changes
@@ skipping 32 matching lines @@
     return;
 
   // We only adjust the DWM's glass rendering when we're a browser window or a
   // detached popup. App windows get the standard client edge.
   if (browser_view_->IsTabStripVisible() ||
       browser_view_->IsToolbarVisible()) {
     // By default, we just want to adjust the glass by the width of the inner
     // bevel that aero renders to demarcate the client area. We supply our own
     // client edge for the browser window and detached popups, so we don't want
     // to show the default one.
-    int client_edge_left_width = kWindowsDWMBevelSize;
-    int client_edge_right_width = kWindowsDWMBevelSize;
-    int client_edge_bottom_height = kWindowsDWMBevelSize;
-    int client_edge_top_height = kWindowsDWMBevelSize;
+    int client_edge_left_width = kWindowHorizontalClientEdgeWidth + 1;
+    int client_edge_right_width = kWindowHorizontalClientEdgeWidth + 1;
+    int client_edge_bottom_height = kWindowBottomClientEdgeHeight + 1;
+    int client_edge_top_height = kWindowBottomClientEdgeHeight;
     if (browser_view_->IsTabStripVisible()) {
       gfx::Rect tabstrip_bounds =
           GetBoundsForTabStrip(browser_view_->tabstrip());
-      client_edge_top_height =
-          client_view()->y() + tabstrip_bounds.bottom();
+      client_edge_top_height = tabstrip_bounds.bottom();
     }
 
     // Now poke the DWM.
     MARGINS margins = { client_edge_left_width, client_edge_right_width,
                         client_edge_top_height, client_edge_bottom_height };
     // Note: we don't use DwmEnableBlurBehindWindow because any region not
     // included in the glass region is composited source over. This means
     // that anything drawn directly with GDI appears fully transparent.
     DwmExtendFrameIntoClientArea(GetHWND(), &margins);
   }
@@ skipping 30 matching lines @@
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle &rb = ResourceBundle::GetSharedInstance();
     for (int i = 0; i < kThrobberIconCount; ++i) {
       throbber_icons_[i] = rb.LoadThemeIcon(IDR_THROBBER_01 + i);
       DCHECK(throbber_icons_[i]);
     }
     initialized = true;
   }
 }