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

Conform more tightly with the BeBook, and fix a few crashing bugs in the process

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3472 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
haydentech 2003-06-11 14:13:29 +00:00
parent 303dc7b976
commit b7b28df023
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,7 +201,10 @@ void BStatusBar::AttachedToWindow()
ResizeTo(Frame().Width(), height); ResizeTo(Frame().Width(), height);
if (Parent()) if (Parent())
SetViewColor(Parent ()->ViewColor()); {
SetViewColor(Parent()->ViewColor());
SetLowColor(Parent()->ViewColor());
}
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void BStatusBar::MessageReceived(BMessage *message) void BStatusBar::MessageReceived(BMessage *message)
@ -342,12 +345,13 @@ void BStatusBar::SetBarHeight(float height)
ResizeTo(frame.Width(), fBarHeight + 16); ResizeTo(frame.Width(), fBarHeight + 16);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void BStatusBar::SetText ( const char *string ) void BStatusBar::SetText (const char *string)
{ {
if (fText) if (fText)
free(fText); free(fText);
fText = strdup(string); if (string)
fText = strdup(string);
Invalidate(); Invalidate();
} }
@ -357,7 +361,8 @@ void BStatusBar::SetTrailingText(const char *string)
if (fTrailingText) if (fTrailingText)
free(fTrailingText); free(fTrailingText);
fTrailingText = strdup(string); if (string)
fTrailingText = strdup(string);
Invalidate(); Invalidate();
} }
@ -378,13 +383,15 @@ void BStatusBar::Update(float delta, const char *text, const char *trailingText)
if (fText) if (fText)
free(fText); free(fText);
fText = strdup(text); if (text)
fText = strdup(text);
if (fTrailingText) if (fTrailingText)
free(fTrailingText); free(fTrailingText);
fTrailingText = strdup(trailingText); if (trailingText)
fTrailingText = strdup(trailingText);
Invalidate(); Invalidate();
} }
@ -394,17 +401,27 @@ void BStatusBar::Reset(const char *label, const char *trailingLabel)
if (fLabel) if (fLabel)
free(fLabel); free(fLabel);
fLabel = strdup(label); if (label)
fLabel = strdup(label);
if (fTrailingLabel) if (fTrailingLabel)
free(fTrailingLabel); free(fTrailingLabel);
fTrailingLabel = strdup(trailingLabel); if (trailingLabel)
fTrailingLabel = strdup(trailingLabel);
if (fText)
free(fText);
if (fTrailingText)
free(fTrailingText);
fCurrent = 0.0f; fCurrent = 0.0f;
fMax = 100.0f;
Invalidate(); Invalidate();
} }
//------------------------------------------------------------------------------
float BStatusBar::CurrentValue() const float BStatusBar::CurrentValue() const
{ {
return fCurrent; return fCurrent;