Fix sad tab in native_widget_views

views/widget/native_widget_views.cc

 // Copyright (c) 2011 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 "views/widget/native_widget_views.h"
 
 #include "base/bind.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/compositor/compositor.h"
 #include "ui/gfx/compositor/layer.h"
@@ skipping 27 matching lines @@
 }  // namespace
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetViews, public:
 
 NativeWidgetViews::NativeWidgetViews(internal::NativeWidgetDelegate* delegate)
     : delegate_(delegate),
       parent_(NULL),
+      bounds_relative_to_parent_(false),
       view_(NULL),
       active_(false),
       window_state_(ui::SHOW_STATE_DEFAULT),
       always_on_top_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(close_widget_factory_(this)),
       ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET),
       delete_native_view_(true) {
 }
 
 NativeWidgetViews::~NativeWidgetViews() {
@@ skipping 76 matching lines @@
   return HandleWindowOperation(event) ? true : delegate_->OnMouseEvent(event);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetViews, NativeWidget implementation:
 
 void NativeWidgetViews::InitNativeWidget(const Widget::InitParams& params) {
   parent_ = params.parent_widget;
   ownership_ = params.ownership;
   always_on_top_ = params.keep_on_top;
+  bounds_relative_to_parent_ =
+      (params.type == Widget::InitParams::TYPE_CONTROL);
   View* parent_view = NULL;
   if (params.parent_widget) {
     parent_view = params.parent_widget->GetChildViewParent();
   } else if (ViewsDelegate::views_delegate &&
              ViewsDelegate::views_delegate->GetDefaultParentView() &&
              !params.child) {
     parent_view = ViewsDelegate::views_delegate->GetDefaultParentView();
   } else if (params.parent) {
     Widget* widget = Widget::GetWidgetForNativeView(params.parent);
     parent_view = widget->GetChildViewParent();
   }
 
-  gfx::Rect bounds = AdjustRectOriginForParentWidget(params.bounds,
-                                                     parent_);
+  gfx::Rect bounds = bounds_relative_to_parent_ ?
+      params.bounds : AdjustRectOriginForParentWidget(params.bounds, parent_);
   view_ = new internal::NativeWidgetView(this);
   view_->SetBoundsRect(bounds);
   view_->SetVisible(params.type == Widget::InitParams::TYPE_CONTROL);
 
   // With the default NATIVE_WIDGET_OWNS_WIDGET ownership, the
   // deletion of either of the NativeWidgetViews or NativeWidgetView
   // (e.g. via View hierarchy destruction) will delete the other.
   // With WIDGET_OWNS_NATIVE_WIDGET, NativeWidgetViews should only
   // be deleted by its Widget.
   if (ownership_ == Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET)
     view_->set_delete_native_widget(false);
-
   if (parent_view)
     parent_view->AddChildView(view_);
   view_->SetPaintToLayer(true);
   if (View::get_use_acceleration_when_possible())
     view_->SetFillsBoundsOpaquely(!params.transparent);
   // TODO(beng): SetInitParams().
 }
 
 NonClientFrameView* NativeWidgetViews::CreateNonClientFrameView() {
   return NULL;
@@ skipping 164 matching lines @@
 
 gfx::Rect NativeWidgetViews::GetClientAreaScreenBounds() const {
   return GetWindowScreenBounds();
 }
 
 gfx::Rect NativeWidgetViews::GetRestoredBounds() const {
   return GetWindowScreenBounds();
 }
 
 void NativeWidgetViews::SetBounds(const gfx::Rect& bounds) {
   // |bounds| are supplied in the coordinates of the parent.

[sadrul, 2011/11/14 17:23:04]

Update the comment here explaining that for toplevel widgets, it is necessary to
set the bounds on NativeWidgetView in screen coordinate system, but doing so is
not necessary for control widgets.

-  view_->SetBoundsRect(AdjustRectOriginForParentWidget(bounds, parent_));
+  if (bounds_relative_to_parent_)
+    view_->SetBoundsRect(bounds);

[sadrul, 2011/11/14 17:23:04]

Is it sufficient to just check for !GetWidget()->is_top_level()? Or does that
break tooltip positioning?

+  else
+    view_->SetBoundsRect(AdjustRectOriginForParentWidget(bounds, parent_));
 }
 
 void NativeWidgetViews::SetSize(const gfx::Size& size) {
   view_->SetSize(size);
 }
 
 void NativeWidgetViews::MoveAbove(gfx::NativeView native_view) {
   NOTIMPLEMENTED();
 }
 
@@ skipping 270 matching lines @@
       }
       default:
         // Everything else falls into standard client event handling.
         break;
     }
   }
   return false;
 }
 
 }  // namespace views