From 8d8da849c8c1a4986566107da6e5e3f4ae14ad35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 31 Mar 2009 13:01:42 +0000 Subject: [PATCH] * Added missing MaxSize() implementation. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29819 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/interface/ScrollView.h | 3 ++- src/kits/interface/ScrollView.cpp | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/headers/os/interface/ScrollView.h b/headers/os/interface/ScrollView.h index 7600a8f118..9901bb4d4d 100644 --- a/headers/os/interface/ScrollView.h +++ b/headers/os/interface/ScrollView.h @@ -1,5 +1,5 @@ /* - * Copyright 2004-2008, Haiku Inc. All Rights Reserved. + * Copyright 2004-2009, Haiku Inc. All Rights Reserved. * Distributed under the terms of the MIT license. */ #ifndef _SCROLL_VIEW_H @@ -68,6 +68,7 @@ public: virtual status_t GetSupportedSuites(BMessage* data); virtual BSize MinSize(); + virtual BSize MaxSize(); virtual BSize PreferredSize(); virtual void InvalidateLayout(bool descendants = false); diff --git a/src/kits/interface/ScrollView.cpp b/src/kits/interface/ScrollView.cpp index 15ec67585b..5dad5b90fe 100644 --- a/src/kits/interface/ScrollView.cpp +++ b/src/kits/interface/ScrollView.cpp @@ -1,10 +1,10 @@ /* - * Copyright 2004-2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Copyright 2004-2009, Axel Dörfler, axeld@pinc-software.de. * Distributed under the terms of the MIT License. */ -#include -#include + +#include #include #include @@ -747,6 +747,16 @@ BScrollView::MinSize() } +BSize +BScrollView::MaxSize() +{ + BSize size = _ComputeSize(fTarget != NULL ? fTarget->MaxSize() + : BSize(B_SIZE_UNLIMITED, B_SIZE_UNLIMITED)); + + return BLayoutUtils::ComposeSize(ExplicitMinSize(), size); +} + + BSize BScrollView::PreferredSize() {