Make SingleSplitView take borders into account.

ui/views/controls/single_split_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 "ui/views/controls/single_split_view.h"
 
 #include "build/build_config.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
+#include "ui/views/border.h"
 #include "ui/views/controls/single_split_view_listener.h"
 #include "ui/views/native_cursor.h"
 
 #if defined(OS_WIN)
 #include "skia/ext/skia_utils_win.h"
 #endif
 
 namespace views {
 
 // static
@@ skipping 16 matching lines @@
 #if defined(OS_WIN)
   set_background(
       views::Background::CreateSolidBackground(
           skia::COLORREFToSkColor(GetSysColor(COLOR_3DFACE))));
 #endif
 }
 
 void SingleSplitView::Layout() {
   gfx::Rect leading_bounds;
   gfx::Rect trailing_bounds;
-  CalculateChildrenBounds(bounds(), &leading_bounds, &trailing_bounds);
+  CalculateChildrenBounds(GetContentsBounds(), &leading_bounds,
+                          &trailing_bounds);
 
   if (has_children()) {
     if (child_at(0)->visible())
       child_at(0)->SetBoundsRect(leading_bounds);
     if (child_count() > 1) {
       if (child_at(1)->visible())
         child_at(1)->SetBoundsRect(trailing_bounds);
     }
   }
 
@@ skipping 21 matching lines @@
       height = std::max(height, pref.height());
     } else {
       width = std::max(width, pref.width());
       height += pref.height();
     }
   }
   if (is_horizontal_)
     width += GetDividerSize();
   else
     height += GetDividerSize();
+  width += border()->GetInsets().width();

[sky, 2016/02/16 16:33:51]

border may be null. Use GetInsets().

[julienp, 2016/02/17 13:46:26]

Done.

+  height += border()->GetInsets().height();
   return gfx::Size(width, height);
 }
 
 gfx::NativeCursor SingleSplitView::GetCursor(const ui::MouseEvent& event) {
   if (!IsPointInDivider(event.location()))
     return gfx::kNullCursor;
   return is_horizontal_ ? GetNativeEastWestResizeCursor()
                         : GetNativeNorthSouthResizeCursor();
 }
 
@@ skipping 17 matching lines @@
   }
 
   int divider_at;
 
   if (!is_trailing_visible) {
     divider_at = GetPrimaryAxisSize(bounds.width(), bounds.height());
   } else if (!is_leading_visible) {
     divider_at = 0;
   } else {
     divider_at =
-        CalculateDividerOffset(divider_offset_, this->bounds(), bounds);
+        CalculateDividerOffset(divider_offset_, GetContentsBounds(), bounds);

[sky, 2016/02/16 16:33:51]

GetContentsBounds() -> bounds

[julienp, 2016/02/17 13:46:26]

Done.

     divider_at = NormalizeDividerOffset(divider_at, bounds);
   }
 
   int divider_size = GetDividerSize();
 
   if (is_horizontal_) {
-    *leading_bounds = gfx::Rect(0, 0, divider_at, bounds.height());
+    *leading_bounds =
+        gfx::Rect(bounds.x(), bounds.y(), divider_at, bounds.height());
     *trailing_bounds =
-        gfx::Rect(divider_at + divider_size, 0,
+        gfx::Rect(divider_at + divider_size + bounds.x(), bounds.y(),
                   std::max(0, bounds.width() - divider_at - divider_size),
                   bounds.height());
   } else {
-    *leading_bounds = gfx::Rect(0, 0, bounds.width(), divider_at);
-    *trailing_bounds =
-        gfx::Rect(0, divider_at + divider_size, bounds.width(),
-                  std::max(0, bounds.height() - divider_at - divider_size));
+    *leading_bounds =
+        gfx::Rect(bounds.x(), bounds.y(), bounds.width(), divider_at);
+    *trailing_bounds = gfx::Rect(
+        bounds.x(), divider_at + divider_size + bounds.y(), bounds.width(),
+        std::max(0, bounds.height() - divider_at - divider_size));
   }
 }
 
 void SingleSplitView::SetAccessibleName(const base::string16& name) {
   accessible_name_ = name;
 }
 
 bool SingleSplitView::OnMousePressed(const ui::MouseEvent& event) {
   if (!IsPointInDivider(event.location()))
     return false;
   drag_info_.initial_mouse_offset = GetPrimaryAxisSize(event.x(), event.y());
   drag_info_.initial_divider_offset =
-      NormalizeDividerOffset(divider_offset_, bounds());
+      NormalizeDividerOffset(divider_offset_, GetContentsBounds());
   return true;
 }
 
 bool SingleSplitView::OnMouseDragged(const ui::MouseEvent& event) {
   if (child_count() < 2)
     return false;
 
   int delta_offset = GetPrimaryAxisSize(event.x(), event.y()) -
       drag_info_.initial_mouse_offset;
   if (is_horizontal_ && base::i18n::IsRTL())
@@ skipping 22 matching lines @@
     return;
 
   if (drag_info_.initial_divider_offset != divider_offset_) {
     set_divider_offset(drag_info_.initial_divider_offset);
     if (!listener_ || listener_->SplitHandleMoved(this))
       Layout();
   }
 }
 
 void SingleSplitView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
-  divider_offset_ = CalculateDividerOffset(divider_offset_, previous_bounds,
-                                           bounds());
+  gfx::Rect previous_content_bounds = previous_bounds;
+  if (border())
+    previous_content_bounds.Inset(border()->GetInsets());
+  divider_offset_ = CalculateDividerOffset(
+      divider_offset_, previous_content_bounds, GetContentsBounds());
 }
 
 bool SingleSplitView::IsPointInDivider(const gfx::Point& p) {
   if (resize_disabled_)
     return false;
 
   if (child_count() < 2)
     return false;
 
   if (!child_at(0)->visible() || !child_at(1)->visible())
@@ skipping 37 matching lines @@
                                             const gfx::Rect& bounds) const {
   int primary_axis_size = GetPrimaryAxisSize(bounds.width(), bounds.height());
   if (divider_offset < 0)
     // primary_axis_size may < GetDividerSize during initial layout.
     return std::max(0, (primary_axis_size - GetDividerSize()) / 2);
   return std::min(divider_offset,
                   std::max(primary_axis_size - GetDividerSize(), 0));
 }
 
 }  // namespace views