Add layout support for invisible SingleSplitView children.

views/controls/single_split_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 "views/controls/single_split_view.h"
 
 #if defined(OS_LINUX)
 #include <gdk/gdk.h>
 #endif
 
@@ skipping 17 matching lines @@
       views::Background::CreateSolidBackground(
           skia::COLORREFToSkColor(GetSysColor(COLOR_3DFACE))));
 }
 
 void SingleSplitView::Layout() {
   if (GetChildViewCount() != 2)
     return;
 
   View* leading = GetChildViewAt(0);
   View* trailing = GetChildViewAt(1);
-  if (divider_offset_ < 0)
-    divider_offset_ = (GetPrimaryAxisSize() - kDividerSize) / 2;
-  else
-    divider_offset_ = std::min(divider_offset_,
-                               GetPrimaryAxisSize() - kDividerSize);
 
-  if (is_horizontal_) {
-    leading->SetBounds(0, 0, divider_offset_, height());
-    trailing->SetBounds(divider_offset_ + kDividerSize, 0,
-                        width() - divider_offset_ - kDividerSize, height());
+  if (!leading->IsVisible() && !trailing->IsVisible())
+    return;
+
+  if (!trailing->IsVisible()) {
+    leading->SetBounds(0, 0, width(), height());
+  } else if (!leading->IsVisible()) {
+    trailing->SetBounds(0, 0, width(), height());
   } else {
-    leading->SetBounds(0, 0, width(), divider_offset_);
-    trailing->SetBounds(0, divider_offset_ + kDividerSize,
-                        width(), height() - divider_offset_ - kDividerSize);
+    if (divider_offset_ < 0)
+      divider_offset_ = (GetPrimaryAxisSize() - kDividerSize) / 2;
+    else
+      divider_offset_ = std::min(divider_offset_,
+                                 GetPrimaryAxisSize() - kDividerSize);
+
+    if (is_horizontal_) {
+      leading->SetBounds(0, 0, divider_offset_, height());
+      trailing->SetBounds(divider_offset_ + kDividerSize, 0,
+                          width() - divider_offset_ - kDividerSize, height());
+    } else {
+      leading->SetBounds(0, 0, width(), divider_offset_);
+      trailing->SetBounds(0, divider_offset_ + kDividerSize,
+                          width(), height() - divider_offset_ - kDividerSize);
+    }
   }
 
   SchedulePaint();
 
   // Invoke super's implementation so that the children are layed out.
   View::Layout();
 }
 
 gfx::Size SingleSplitView::GetPreferredSize() {
   int width = 0;
@@ skipping 70 matching lines @@
   if (canceled && drag_info_.initial_divider_offset != divider_offset_) {
     set_divider_offset(drag_info_.initial_divider_offset);
     Layout();
   }
 }
 
 bool SingleSplitView::IsPointInDivider(int x, int y) {
   if (GetChildViewCount() < 2)
     return false;
 
+  if (!GetChildViewAt(0)->IsVisible() || !GetChildViewAt(1)->IsVisible())
+    return false;
+
   int divider_relative_offset;
   if (is_horizontal_) {
     divider_relative_offset =
         x - GetChildViewAt(UILayoutIsRightToLeft() ? 1 : 0)->width();
   } else {
     divider_relative_offset = y - GetChildViewAt(0)->height();
   }
   return (divider_relative_offset >= 0 &&
       divider_relative_offset < kDividerSize);
 }
 
 }  // namespace views