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

Merge from layout management branch.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18649 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2006-08-26 16:21:15 +00:00
parent 01595708f3
commit 9ecf9d1c1d
277 changed files with 45889 additions and 747 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/ScrollView.cpp
+39
View File
@@ -5,6 +5,7 @@
#include <stdio.h>
#include <LayoutUtils.h>
#include <ScrollView.h>
#include <Message.h>
#include <Window.h>
@@ -594,6 +595,44 @@ BScrollView::GetSupportedSuites(BMessage *data)
}
BSize
BScrollView::MinSize()
{
// TODO: This is not yet correct.
BSize size = (fTarget ? fTarget->MinSize() : BSize(-1, -1));
if (fVerticalScrollBar)
size.width += B_V_SCROLL_BAR_WIDTH;
if (fHorizontalScrollBar)
size.height += B_H_SCROLL_BAR_HEIGHT;
float borderSize = BorderSize(fBorder);
size.width += 2 * borderSize;
size.height += 2 * borderSize;
return BLayoutUtils::ComposeSize(ExplicitMinSize(), size);
}
BSize
BScrollView::PreferredSize()
{
// TODO: This is not yet correct.
BSize size = (fTarget ? fTarget->PreferredSize() : BSize(-1, -1));
if (fVerticalScrollBar)
size.width += B_V_SCROLL_BAR_WIDTH;
if (fHorizontalScrollBar)
size.height += B_H_SCROLL_BAR_HEIGHT;
float borderSize = BorderSize(fBorder);
size.width += 2 * borderSize;
size.height += 2 * borderSize;
return BLayoutUtils::ComposeSize(ExplicitMinSize(), size);
}
status_t
BScrollView::Perform(perform_code d, void *arg)
{