frontend: Additional addSideText overload

Warzone2100 · Oct 11, 2023 · 58d10de · 58d10de
1 parent 8349230
commit 58d10de
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/frontend.cpp b/src/frontend.cpp
@@ -3703,13 +3703,13 @@ void addText(UDWORD id, UDWORD PosX, UDWORD PosY, const char *txt, UDWORD formID
 }
 
 // ////////////////////////////////////////////////////////////////////////////
-W_LABEL *addSideText(const std::shared_ptr<W_SCREEN> &psScreen, UDWORD formId, UDWORD id, UDWORD PosX, UDWORD PosY, const char *txt)
+std::shared_ptr<W_LABEL> addSideText(WIDGET* psParent, UDWORD id, UDWORD PosX, UDWORD PosY, const char *txt)
 {
-	ASSERT_OR_RETURN(nullptr, psScreen != nullptr, "Invalid screen pointer");
+	ASSERT_OR_RETURN(nullptr, psParent != nullptr, "Invalid parent");
 
 	W_LABINIT sLabInit;
 
-	sLabInit.formID = formId;
+	sLabInit.formID = 0;
 	sLabInit.id = id;
 	sLabInit.x = (short) PosX;
 	sLabInit.y = (short) PosY;
@@ -3727,7 +3727,17 @@ W_LABEL *addSideText(const std::shared_ptr<W_SCREEN> &psScreen, UDWORD formId, U
 		psWidget->pUserData = nullptr;
 	};
 
-	return widgAddLabel(psScreen, &sLabInit);
+	auto psLabel = std::make_shared<W_LABEL>(&sLabInit);
+	psParent->attach(psLabel);
+	return psLabel;
+}
+
+W_LABEL *addSideText(const std::shared_ptr<W_SCREEN> &psScreen, UDWORD formId, UDWORD id, UDWORD PosX, UDWORD PosY, const char *txt)
+{
+	ASSERT_OR_RETURN(nullptr, psScreen != nullptr, "Invalid screen pointer");
+
+	WIDGET *psParent = widgGetFromID(psScreen, formId);
+	return addSideText(psParent, id, PosX, PosY, txt).get();
 }
 
 W_LABEL *addSideText(UDWORD id, UDWORD PosX, UDWORD PosY, const char *txt)

diff --git a/src/frontend.h b/src/frontend.h
@@ -90,6 +90,7 @@ void addBottomForm(bool wide = false);
 W_FORM *addBackdrop();
 W_FORM *addBackdrop(const std::shared_ptr<W_SCREEN> &screen);
 void addTextButton(UDWORD id, UDWORD PosX, UDWORD PosY, const std::string &txt, unsigned int style);
+std::shared_ptr<W_LABEL> addSideText(WIDGET* psParent, UDWORD id, UDWORD PosX, UDWORD PosY, const char *txt);
 W_LABEL *addSideText(UDWORD id, UDWORD PosX, UDWORD PosY, const char *txt);
 W_LABEL *addSideText(const std::shared_ptr<W_SCREEN> &screen, UDWORD formId, UDWORD id, UDWORD PosX, UDWORD PosY, const char *txt);
 void addFESlider(UDWORD id, UDWORD parent, UDWORD x, UDWORD y, UDWORD stops, UDWORD pos);