i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Added missing MaxSize() implementation.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29819 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-03-31 13:01:42 +00:00
parent ee6a2e164f
commit 8d8da849c8
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/ScrollView.h
+2 -1
View File
@@ -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. * Distributed under the terms of the MIT license.
*/ */
#ifndef _SCROLL_VIEW_H #ifndef _SCROLL_VIEW_H
@@ -68,6 +68,7 @@ public:
virtual status_t GetSupportedSuites(BMessage* data); virtual status_t GetSupportedSuites(BMessage* data);
virtual BSize MinSize(); virtual BSize MinSize();
virtual BSize MaxSize();
virtual BSize PreferredSize(); virtual BSize PreferredSize();
virtual void InvalidateLayout(bool descendants = false); virtual void InvalidateLayout(bool descendants = false);
src/kits/interface/ScrollView.cpp
+13 -3
View File
@@ -1,10 +1,10 @@
/* /*
* Copyright 2004-2005, Axel Dörfler, [email protected]. All rights reserved. * Copyright 2004-2009, Axel Dörfler, [email protected].
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#include <ScrollView.h>
#include <stdio.h>
#include <ScrollView.h>
#include <ControlLook.h> #include <ControlLook.h>
#include <LayoutUtils.h> #include <LayoutUtils.h>
@@ -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 BSize
BScrollView::PreferredSize() BScrollView::PreferredSize()
{ {