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

If we already figured out the correct low colow to use in AttachedToWindow(),

Browse Source 
we might as well use it. Couldn't see any regressions so far.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35457 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2010-02-13 11:43:01 +00:00
parent 8bb32d7ee0
commit 861e4437b1
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/kits/interface/Button.cpp
View File

@ -105,12 +105,8 @@ BButton::Draw(BRect updateRect)
{ {
if (be_control_look != NULL) { if (be_control_look != NULL) {
BRect rect(Bounds()); BRect rect(Bounds());
rgb_color background = B_TRANSPARENT_COLOR; rgb_color background = LowColor();
if (Parent()) rgb_color base = background;
background = Parent()->ViewColor();
if (background == B_TRANSPARENT_COLOR)
background = ui_color(B_PANEL_BACKGROUND_COLOR);
rgb_color base = LowColor();
uint32 flags = be_control_look->Flags(this); uint32 flags = be_control_look->Flags(this);
if (IsDefault()) if (IsDefault())
flags |= BControlLook::B_DEFAULT_BUTTON; flags |= BControlLook::B_DEFAULT_BUTTON;

6
src/kits/interface/StatusBar.cpp
View File

@ -278,11 +278,7 @@ BStatusBar::FrameResized(float newWidth, float newHeight)
void void
BStatusBar::Draw(BRect updateRect) BStatusBar::Draw(BRect updateRect)
{ {
rgb_color backgroundColor; rgb_color backgroundColor = LowColor();
if (Parent())
backgroundColor = Parent()->ViewColor();
else
backgroundColor = ui_color(B_PANEL_BACKGROUND_COLOR);
font_height fontHeight; font_height fontHeight;
GetFontHeight(&fontHeight); GetFontHeight(&fontHeight);