From 5d67bb7cfa0f182fdbfddbab828b12e22a8a7539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Mon, 23 Mar 2009 11:20:16 +0000 Subject: [PATCH] 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 --- src/kits/interface/ScrollView.cpp | 34 ++++++++----------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/src/kits/interface/ScrollView.cpp b/src/kits/interface/ScrollView.cpp index 7bb8bad990..15ec67585b 100644 --- a/src/kits/interface/ScrollView.cpp +++ b/src/kits/interface/ScrollView.cpp @@ -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(®ion); - } - 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; }