* Moved class BStringItem into its own source file.

* Changed BStringItem::Update() to set a better baseline offset and height;
  this should improve vertical text placement.
* Fixed a bug in BStringItem::Update(): it used the owner to determine the
  width, but must use the font passed in instead.
* Coding style cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31090 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/os/interface/ListItem.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _LIST_ITEM_H
@@ -49,6 +49,7 @@ class BListItem : public BArchivable {
 private:
 	friend class BOutlineListView;
 	friend class BListView;
+
 			bool			HasSubitems() const;
 
 	virtual	void			_ReservedListItem1();
@@ -62,6 +63,7 @@ class BListItem : public BArchivable {
 	inline	float			Top() const;
 	inline	float			Bottom() const;
 			void			SetTop(float top);
+
 private:
 			float			fTop;
 			BList*			fTemporaryList;
@@ -75,18 +77,21 @@ class BListItem : public BArchivable {
 			bool			fVisible : 1;
 };
 
+
 inline float
 BListItem::Top(void) const 
 {
 	return fTop;
 }
 
+
 inline float
 BListItem::Bottom(void) const
 {
-	return (fTop + ceilf(fHeight) - 1.0);
+	return fTop + ceilf(fHeight) - 1.0;
 }
 
+
 #include <StringItem.h>
 	// to maintain source compatibility
 

headers/os/interface/StringItem.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _STRING_ITEM_H
@@ -11,15 +11,16 @@
 
 class BStringItem : public BListItem {
 public:
-							BStringItem(const char* text, uint32 outlineLevel = 0,
+							BStringItem(const char* text,
-								bool expanded = true);
+								uint32 outlineLevel = 0, bool expanded = true);
 							BStringItem(BMessage* archive);
 	virtual					~BStringItem();
 
 	static	BArchivable*	Instantiate(BMessage* archive);
 	virtual	status_t		Archive(BMessage* archive, bool deep = true) const;
 
-		virtual	void		DrawItem(BView* owner, BRect frame, bool complete = false);
+	virtual	void			DrawItem(BView* owner, BRect frame,
+								bool complete = false);
 	virtual	void			SetText(const char* text);
 			const char*		Text() const;
 

src/kits/interface/Jamfile

@@ -114,6 +114,7 @@ MergeObject <libbe>interface_kit.o :
 	SplitLayoutBuilder.cpp
 	SplitView.cpp
 	StatusBar.cpp
+	StringItem.cpp
 	StringView.cpp
 	TabView.cpp
 	TextControl.cpp

src/kits/interface/ListItem.cpp

@@ -1,41 +1,22 @@
-//------------------------------------------------------------------------------
+/*
-//	Copyright (c) 2001-2008, Haiku, Inc.
+ * Copyright 2001-2009, Haiku, Inc. All Rights Reserved.
-//
+ * Distributed under the terms of the MIT License.
-//	Permission is hereby granted, free of charge, to any person obtaining a
+ *
-//	copy of this software and associated documentation files (the "Software"),
+ * Authors:
-//	to deal in the Software without restriction, including without limitation
+ *		Ulrich Wimboeck
-//	the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *		Marc Flerackers ([email protected])
-//	and/or sell copies of the Software, and to permit persons to whom the
+ *		Rene Gollent
-//	Software is furnished to do so, subject to the following conditions:
+ */
-//
-//	The above copyright notice and this permission notice shall be included in
-//	all copies or substantial portions of the Software.
-//
-//	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-//	DEALINGS IN THE SOFTWARE.
-//
-//	File Name:		ListItem.cpp
-//	Author:			Ulrich Wimboeck
-//				Marc Flerackers ([email protected])
-//				Rene Gollent
-//	Description:	BListItem is the base class for BListView's items,
-//					BStringItem is a subclass of BListItem which draws a string.
-//------------------------------------------------------------------------------
-#include <stdlib.h>
-#include <string.h>
 
 #include <ListItem.h>
+
 #include <Message.h>
 #include <View.h>
 
 
 BListItem::BListItem(uint32 level, bool expanded)
-	:	fTop(0.0),
+	:
+	fTop(0.0),
 	fWidth(0),
 	fHeight(0),
 	fLevel(level),
@@ -81,7 +62,6 @@ status_t
 BListItem::Archive(BMessage* archive, bool deep) const
 {
 	status_t status = BArchivable::Archive(archive, deep);
-
 	if (status == B_OK && fSelected)
 		status = archive->AddBool("_sel", true);
 	
@@ -168,7 +148,7 @@ BListItem::Update(BView *owner, const BFont *font)
 	font->GetHeight(&fh);
 
 	SetWidth(owner->Bounds().Width());
-	SetHeight(fh.ascent + fh.descent + fh.leading);
+	SetHeight(ceilf(fh.ascent + fh.descent + fh.leading));
 }
 
 
@@ -211,174 +191,23 @@ void BListItem::_ReservedListItem1() {}
 void BListItem::_ReservedListItem2() {}
 
 
-BListItem::BListItem(const BListItem &item)
-{
-}
-
-
-BListItem &
-BListItem::operator=(const BListItem &)
-{
-	return *this;
-}
-
-
 bool
 BListItem::IsItemVisible() const
 {
 	return fVisible;
 }
 
+
 void
 BListItem::SetTop(float top)
 {
 	fTop = top;
 }
 
+
 void
 BListItem::SetItemVisible(bool visible)
 {
 	fVisible = visible;
 }
 
-
-// BStringItem
-BStringItem::BStringItem(const char *text, uint32 level, bool expanded)
-	:	BListItem(level, expanded),
-		fText(NULL),
-		fBaselineOffset(0)
-{	
-	SetText(text);
-}
-
-
-BStringItem::BStringItem(BMessage *archive)
-	:	BListItem(archive),
-		fText(NULL),
-		fBaselineOffset(0)
-{
-	const char *string;
-
-	if (archive->FindString("_label", &string) == B_OK)
-		SetText(string);
-}
-
-
-BStringItem::~BStringItem()
-{
-	free(fText);
-}
-
-
-BArchivable	*
-BStringItem::Instantiate(BMessage *archive)
-{
-	if (validate_instantiation(archive, "BStringItem"))
-		return new BStringItem(archive);
-	else
-		return NULL;
-}
-
-
-status_t
-BStringItem::Archive(BMessage *archive, bool deep) const
-{
-	status_t status = BListItem::Archive(archive);
-
-	if (status == B_OK && fText != NULL)
-		status = archive->AddString("_label", fText);
-
-	return status;
-}
-
-
-void
-BStringItem::DrawItem(BView *owner, BRect frame, bool complete)
-{
-	if (fText == NULL)
-		return;
-
-	rgb_color highColor = owner->HighColor();
-	rgb_color lowColor = owner->LowColor();
-
-	if (IsSelected() || complete) {
-		if (IsSelected()) {
-			owner->SetHighColor(tint_color(lowColor, B_DARKEN_2_TINT));
-			owner->SetLowColor(owner->HighColor());
-		} else
-			owner->SetHighColor(lowColor);
-
-		owner->FillRect(frame);
-	}
-
-	owner->MovePenTo(frame.left, frame.top + fBaselineOffset);
-
-	rgb_color black = {0, 0, 0, 255};
-
-	if (!IsEnabled())
-		owner->SetHighColor(tint_color(black, B_LIGHTEN_2_TINT));
-	else
-		owner->SetHighColor(black);
-
-	owner->DrawString(fText);
-
-	owner->SetHighColor(highColor);
-	owner->SetLowColor(lowColor);
-}
-
-
-void
-BStringItem::SetText(const char *text)
-{
-	free(fText);
-	fText = NULL;
-	
-	if (text)
-		fText = strdup(text);
-}
-
-
-const char *
-BStringItem::Text() const
-{
-	return fText;
-}
-
-
-void
-BStringItem::Update(BView *owner, const BFont *font)
-{
-	if (fText)
-		SetWidth(owner->StringWidth(fText));
-
-	font_height fheight;
-	font->GetHeight(&fheight);
-
-	fBaselineOffset = fheight.ascent + 2 + floorf(fheight.leading / 2);
-
-	SetHeight(ceilf(fheight.ascent) + ceilf(fheight.descent)
-		+ ceilf(fheight.leading) + 4);
-}
-
-
-status_t
-BStringItem::Perform(perform_code d, void *arg)
-{
-	return BListItem::Perform(d, arg);
-}
-
-
-void BStringItem::_ReservedStringItem1() {}
-void BStringItem::_ReservedStringItem2() {}
-
-
-BStringItem::BStringItem(const BStringItem &)
-{
-}
-
-
-BStringItem	&
-BStringItem::operator=(const BStringItem &)
-{
-	return *this;
-}

src/kits/interface/StringItem.cpp

@@ -0,0 +1,158 @@
+/*
+ * Copyright 2001-2009, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Ulrich Wimboeck
+ *		Marc Flerackers ([email protected])
+ *		Rene Gollent
+ */
+
+
+#include <StringItem.h>
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <Message.h>
+#include <View.h>
+
+
+BStringItem::BStringItem(const char* text, uint32 level, bool expanded)
+	: BListItem(level, expanded),
+	fText(NULL),
+	fBaselineOffset(0)
+{	
+	SetText(text);
+}
+
+
+BStringItem::BStringItem(BMessage* archive)
+	: BListItem(archive),
+	fText(NULL),
+	fBaselineOffset(0)
+{
+	const char* string;
+	if (archive->FindString("_label", &string) == B_OK)
+		SetText(string);
+}
+
+
+BStringItem::~BStringItem()
+{
+	free(fText);
+}
+
+
+BArchivable*
+BStringItem::Instantiate(BMessage* archive)
+{
+	if (validate_instantiation(archive, "BStringItem"))
+		return new BStringItem(archive);
+
+	return NULL;
+}
+
+
+status_t
+BStringItem::Archive(BMessage *archive, bool deep) const
+{
+	status_t status = BListItem::Archive(archive);
+
+	if (status == B_OK && fText != NULL)
+		status = archive->AddString("_label", fText);
+
+	return status;
+}
+
+
+void
+BStringItem::DrawItem(BView *owner, BRect frame, bool complete)
+{
+	if (fText == NULL)
+		return;
+
+	rgb_color highColor = owner->HighColor();
+	rgb_color lowColor = owner->LowColor();
+
+	if (IsSelected() || complete) {
+		if (IsSelected()) {
+			owner->SetHighColor(tint_color(lowColor, B_DARKEN_2_TINT));
+			owner->SetLowColor(owner->HighColor());
+		} else
+			owner->SetHighColor(lowColor);
+
+		owner->FillRect(frame);
+	}
+
+	owner->MovePenTo(frame.left, frame.top + fBaselineOffset);
+
+	rgb_color black = {0, 0, 0, 255};
+
+	if (!IsEnabled())
+		owner->SetHighColor(tint_color(black, B_LIGHTEN_2_TINT));
+	else
+		owner->SetHighColor(black);
+
+	owner->DrawString(fText);
+
+	owner->SetHighColor(highColor);
+	owner->SetLowColor(lowColor);
+}
+
+
+void
+BStringItem::SetText(const char *text)
+{
+	free(fText);
+	fText = NULL;
+	
+	if (text)
+		fText = strdup(text);
+}
+
+
+const char *
+BStringItem::Text() const
+{
+	return fText;
+}
+
+
+void
+BStringItem::Update(BView *owner, const BFont *font)
+{
+	if (fText)
+		SetWidth(font->StringWidth(fText));
+
+	font_height fheight;
+	font->GetHeight(&fheight);
+
+	fBaselineOffset = 2 + ceilf(fheight.ascent + fheight.leading / 2);
+
+	SetHeight(ceilf(fheight.ascent) + ceilf(fheight.descent)
+		+ ceilf(fheight.leading) + 4);
+}
+
+
+status_t
+BStringItem::Perform(perform_code d, void *arg)
+{
+	return BListItem::Perform(d, arg);
+}
+
+
+void BStringItem::_ReservedStringItem1() {}
+void BStringItem::_ReservedStringItem2() {}
+
+
+BStringItem::BStringItem(const BStringItem &)
+{
+}
+
+
+BStringItem	&
+BStringItem::operator=(const BStringItem &)
+{
+	return *this;
+}