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

Also draw the scroll corner when there is no border.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30089 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2009-04-09 23:47:54 +00:00
parent b7cafeb2ad
commit c44aa83365
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/ControlLook.cpp
+12 -7
View File
@@ -696,13 +696,6 @@ BControlLook::DrawScrollViewFrame(BView* view, BRect& rect,
BRect horizontalScrollBarFrame, const rgb_color& base, BRect horizontalScrollBarFrame, const rgb_color& base,
border_style border, uint32 flags, uint32 _borders) border_style border, uint32 flags, uint32 _borders)
{ {
if (border == B_NO_BORDER)
return;
bool excludeScrollCorner = border == B_FANCY_BORDER
&& horizontalScrollBarFrame.IsValid()
&& verticalScrollBarFrame.IsValid();
// calculate scroll corner rect before messing with the "rect" // calculate scroll corner rect before messing with the "rect"
BRect scrollCornerFillRect(rect.right, rect.bottom, BRect scrollCornerFillRect(rect.right, rect.bottom,
rect.right, rect.bottom); rect.right, rect.bottom);
@@ -711,6 +704,18 @@ BControlLook::DrawScrollViewFrame(BView* view, BRect& rect,
if (verticalScrollBarFrame.IsValid()) if (verticalScrollBarFrame.IsValid())
scrollCornerFillRect.top = verticalScrollBarFrame.bottom + 1; scrollCornerFillRect.top = verticalScrollBarFrame.bottom + 1;
if (border == B_NO_BORDER) {
if (scrollCornerFillRect.IsValid()) {
view->SetHighColor(base);
view->FillRect(scrollCornerFillRect);
}
return;
}
bool excludeScrollCorner = border == B_FANCY_BORDER
&& horizontalScrollBarFrame.IsValid()
&& verticalScrollBarFrame.IsValid();
uint32 borders = _borders; uint32 borders = _borders;
if (excludeScrollCorner) { if (excludeScrollCorner) {
rect.bottom = horizontalScrollBarFrame.top; rect.bottom = horizontalScrollBarFrame.top;