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

* some simplifications in the code, I'm not sure if it supported NULL texts as

Browse Source 
the BeBook mentions it does
* make sure the view is invalidated on resize
* needs more fixes (for example GetPreferredSize() does not take everything
  into account)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22370 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2007-09-29 12:58:59 +00:00
parent 917870d2ba
commit a788be674b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,6 +91,8 @@ BStatusBar::_InitObject()
fBarColor = kDefaultBarColor;
fCustomBarHeight = false;
SetFlags(Flags() | B_FRAME_EVENTS);
}
@ -356,12 +358,8 @@ BStatusBar::Update(float delta, const char* text, const char* trailingText)
void
BStatusBar::SetTo(float value, const char* text, const char* trailingText)
{
if (text != NULL)
_SetTextData(fText, fTextWidth, text, fLabelWidth, false);
if (trailingText != NULL) {
_SetTextData(fTrailingText, fTrailingTextWidth, trailingText,
fTrailingLabelWidth, true);
}
SetText(text);
SetTrailingText(trailingText);
if (value > fMax)
value = fMax;
@ -527,6 +525,7 @@ void
BStatusBar::FrameResized(float newWidth, float newHeight)
{
BView::FrameResized(newWidth, newHeight);
Invalidate();
}
@ -656,6 +655,9 @@ void
BStatusBar::_SetTextData(BString& text, float& width, const char* source,
float position, bool rightAligned)
{
if (source == NULL)
source = "";
// If there were no changes, we don't have to do anything
if (text == source)
return;