From 4a672db19685df00f748681c57a00ee253a2047e Mon Sep 17 00:00:00 2001 From: "oshima@chromium.org" Date: Fri, 30 Oct 2009 16:45:34 +0000 Subject: Fixed view example. It was failing because some of view classes requires WidgetGTK in view hierarchy to call methods on it. * added ContainerExamlpeBase that defers the creation of such views after WidgetGTK available. minor fixes * replaced unnecessary includes with forward decls. * make sure we don't try to set negative hight to viewport. BUG=None TEST=build & run view_examples Review URL: http://codereview.chromium.org/347010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30586 0039d316-1c4b-4281-b951-d872f2087c98 --- views/controls/scroll_view.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'views/controls/scroll_view.cc') diff --git a/views/controls/scroll_view.cc b/views/controls/scroll_view.cc index a5b5f6a..84ce6c7 100644 --- a/views/controls/scroll_view.cc +++ b/views/controls/scroll_view.cc @@ -190,7 +190,8 @@ void ScrollView::Layout() { // Non-default. if (horiz_sb_required) { - viewport_bounds.set_height(viewport_bounds.height() - horiz_sb_height); + viewport_bounds.set_height( + std::max(0, viewport_bounds.height() - horiz_sb_height)); should_layout_contents = true; } // Default. -- cgit v1.1