Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use BControlLook new BScrollView drawing method. Should have been part of 

last commit...


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29662 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2009-03-23 11:20:16 +00:00
parent 74bb70aef9
commit 5d67bb7cfa
1 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/kits/interface/ScrollView.cpp
View File

@ -229,34 +229,18 @@ BScrollView::Draw(BRect updateRect)
flags |= BControlLook::B_FOCUSED;
BRect rect(Bounds());
rgb_color base = ui_color(B_PANEL_BACKGROUND_COLOR);
if (fBorder == B_FANCY_BORDER
&& fHorizontalScrollBar && fVerticalScrollBar) {
BRect scrollCornerRect(rect);
scrollCornerRect.left = fHorizontalScrollBar->Frame().right + 2;
scrollCornerRect.top = fVerticalScrollBar->Frame().bottom + 2;
BRegion region(rect);
region.Exclude(scrollCornerRect);
ConstrainClippingRegion(&region);
}
be_control_look->DrawBorder(this, rect, updateRect, base, fBorder,
BRect verticalScrollBarFrame(0, 0, -1, -1);
if (fVerticalScrollBar)
verticalScrollBarFrame = fVerticalScrollBar->Frame();
BRect horizontalScrollBarFrame(0, 0, -1, -1);
if (fHorizontalScrollBar)
horizontalScrollBarFrame = fHorizontalScrollBar->Frame();
be_control_look->DrawScrollViewFrame(this, rect, updateRect,
verticalScrollBarFrame, horizontalScrollBarFrame, base, fBorder,
flags);
if (fBorder == B_FANCY_BORDER
&& fHorizontalScrollBar && fVerticalScrollBar) {
ConstrainClippingRegion(NULL);
rect = Bounds().InsetByCopy(1, 1);
rect.right = fHorizontalScrollBar->Frame().right + 1;
be_control_look->DrawBorder(this, rect, updateRect, base, fBorder,
flags, BControlLook::B_RIGHT_BORDER);
rect = Bounds().InsetByCopy(1, 1);
rect.bottom = fVerticalScrollBar->Frame().bottom + 1;
be_control_look->DrawBorder(this, rect, updateRect, base, fBorder,
flags, BControlLook::B_BOTTOM_BORDER);
}
return;
}