Refactor: remove duplicate code

Rework StyledItem so there is no need to reimplement DrawText() in ProjectItem.
Genio-The-Haiku-IDE · Apr 23, 2024 · a345ded · a345ded
1 parent 0d6d4db
commit a345ded
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 52 deletions.
diff --git a/src/project/ProjectItem.cpp b/src/project/ProjectItem.cpp
@@ -172,51 +172,36 @@ ProjectItem::DrawItem(BView* owner, BRect bounds, bool complete)
 	} else {
 		BPoint textPoint(iconRect.right + be_control_look->DefaultLabelSpacing(),
 						bounds.top + BaselineOffset());
+
 		// TODO: Apply any style change here (i.e. bold, italic)
-		BString text = Text();
-		if (fNeedsSave)
-			text.Append("*");
-		text.Append(ExtraText());
+		if (!isProject) {
+			if (fNeedsSave)
+				SetExtraText("*");
+			else
+				SetExtraText("");
+		}
 
-		DrawText(owner, text, textPoint);
+		if (isProject) {
+			// Fill background to the project color
+			ProjectFolder *projectFolder = static_cast<ProjectFolder*>(GetSourceItem());
+			const rgb_color oldColor = owner->HighColor();
+			owner->SetHighColor(projectFolder->Color());
+
+			BRect circleRect;
+			circleRect.top = textPoint.y - BaselineOffset() + 2.5f;
+			circleRect.left = textPoint.x - 3;
+			circleRect.bottom = textPoint.y + 6;
+			circleRect.right = circleRect.left + owner->StringWidth(Text()) + 5;
+			owner->FillRoundRect(circleRect, 9, 10);
+			owner->SetHighColor(oldColor);
+		}
+		DrawText(owner, Text(), ExtraText(), textPoint);
 
 		owner->Sync();
 	}
 }
 
 
-/* virtual */
-void
-ProjectItem::DrawText(BView* owner, const char* text, const BPoint& textPoint)
-{
-	BFont font;
-	owner->GetFont(&font);
-	font.SetFace(TextFontFace());
-	owner->SetFont(&font);
-	owner->SetDrawingMode(B_OP_COPY);
-
-	if (GetSourceItem()->Type() == SourceItemType::ProjectFolderItem) {
-		ProjectFolder *projectFolder = static_cast<ProjectFolder*>(GetSourceItem());
-		const rgb_color oldColor = owner->HighColor();
-		owner->SetHighColor(projectFolder->Color());
-
-		// TODO: Fix these calculations.
-		// Better to change DrawText() to also pass a BRect, maybe
-		BRect circleRect;
-		circleRect.top = textPoint.y - BaselineOffset() + 2.5f;
-		circleRect.left = textPoint.x - 3;
-		circleRect.bottom = textPoint.y + 6;
-		circleRect.right = circleRect.left + owner->StringWidth(Text()) + 5;
-		owner->FillRoundRect(circleRect, 9, 10);
-		owner->SetHighColor(oldColor);
-	}
-	owner->MovePenTo(textPoint);
-	owner->DrawString(text);
-
-	owner->Sync();
-}
-
-
 void
 ProjectItem::SetNeedsSave(bool needs)
 {

diff --git a/src/project/ProjectItem.h b/src/project/ProjectItem.h
@@ -16,7 +16,6 @@ class ProjectItem : public StyledItem {
 					virtual ~ProjectItem();
 
 	virtual void 	DrawItem(BView* owner, BRect bounds, bool complete);
-	virtual void	DrawText(BView* owner, const char* text, const BPoint& textPoint);
 	virtual void 	Update(BView* owner, const BFont* font);
 
 	SourceItem		*GetSourceItem() const { return fSourceItem; };

diff --git a/src/ui/FunctionsOutlineView.cpp b/src/ui/FunctionsOutlineView.cpp
@@ -50,22 +50,13 @@ class SymbolListItem: public StyledItem {
 			SetIconAndTooltip();
 		}
 
-		virtual void DrawItem(BView* owner, BRect bounds, bool complete);
 		const BMessage& Details() const { return fDetails; }
 		void SetIconAndTooltip();
 private:
 		BMessage	fDetails;
 };
 
 
-/* virtual */
-void
-SymbolListItem::DrawItem(BView* owner, BRect bounds, bool complete)
-{
-	StyledItem::DrawItem(owner, bounds, complete);
-}
-
-
 void
 SymbolListItem::SetIconAndTooltip()
 {

diff --git a/src/ui/StyledItem.cpp b/src/ui/StyledItem.cpp
@@ -86,9 +86,7 @@ StyledItem::DrawItem(BView* owner, BRect bounds, bool complete)
 					bounds.top + BaselineOffset());
 
 	// TODO: would be nice to draw extra text in different style
-	BString text(Text());
-	text << fExtraText;
-	DrawText(owner, text.String(), textPoint);
+	DrawText(owner, Text(), ExtraText(), textPoint);
 
 	owner->Sync();
 }
@@ -166,7 +164,8 @@ StyledItem::SetIconFollowsTheme(bool follow)
 
 /* virtual */
 void
-StyledItem::DrawText(BView* owner, const char* text, const BPoint& point)
+StyledItem::DrawText(BView* owner, const char* text,
+				const char* extraText, const BPoint& point)
 {
 	BFont font;
 	owner->GetFont(&font);
@@ -176,6 +175,8 @@ StyledItem::DrawText(BView* owner, const char* text, const BPoint& point)
 	owner->SetDrawingMode(B_OP_COPY);
 	owner->MovePenTo(point);
 	owner->DrawString(text);
+	if (extraText != nullptr)
+		owner->DrawString(extraText);
 }
 
 

diff --git a/src/ui/StyledItem.h b/src/ui/StyledItem.h
@@ -38,7 +38,7 @@ class StyledItem : public BStringItem {
 	virtual BRect	DrawIcon(BView* owner, const BRect& bounds,
 						const BBitmap* icon, float& iconSize);
 	virtual void	DrawText(BView* owner, const char* text,
-						const BPoint& textPoint);
+						const char* extraText, const BPoint& textPoint);
 private:
 	BString			fIconName;
 	uint16			fFontFace;