fix: set visibility of all child components (#59)

adamajammary · Jun 8, 2024 · 236d2c6 · 236d2c6
1 parent 0664514
commit 236d2c6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 18 deletions.
diff --git a/src/LSG_Component.cpp b/src/LSG_Component.cpp
@@ -704,3 +704,11 @@ void LSG_Component::SetSpacing(int spacing)
 {
 	LSG_XML::SetAttribute(this->xmlNode, "spacing", std::to_string(spacing));
 }
+
+void LSG_Component::SetVisible(bool visible)
+{
+	this->visible = visible;
+
+	for (auto child : this->GetChildren())
+		child->SetVisible(visible);
+}
diff --git a/src/LSG_Component.h b/src/LSG_Component.h
@@ -77,6 +77,7 @@ class LSG_Component : public LSG_IRenderable
 	void             SetSizeFixed();
 	void             SetSizePercent(LSG_Component* parent);
 	void             SetSpacing(int spacing);
+	void             SetVisible(bool visible);
 
 protected:
 	void            destroyTextures();

diff --git a/src/LSG_Modal.cpp b/src/LSG_Modal.cpp
@@ -24,7 +24,7 @@ bool LSG_Modal::CloseOnMouseClick(const SDL_Point& mousePosition)
 	bool close            = (clickedCloseIcon || clickedOutside);
 
 	if (close)
-		LSG_Modal::SetVisible(this, false);
+		this->SetVisible(false);
 
 	return close;
 }
@@ -95,7 +95,7 @@ bool LSG_Modal::OnKeyDown(const SDL_KeyboardEvent& event)
 	if (!this->visible || this->hideCloseIcon || (event.keysym.sym != SDLK_ESCAPE))
 		return false;
 
-	LSG_Modal::SetVisible(this, false);
+	this->SetVisible(false);
 
 	return true;
 }
@@ -293,14 +293,3 @@ void LSG_Modal::setTextures(const LSG_UMapStrStr& attributes)
 
 	this->textures[LSG_MODAL_TEXTURE_TITLE] = this->getTexture(title, fontSize);
 }
-
-void LSG_Modal::SetVisible(LSG_Component* component, bool visible)
-{
-	if (!component)
-		return;
-
-	component->visible = visible;
-
-	for (auto child : component->GetChildren())
-		LSG_Modal::SetVisible(child, visible);
-}
diff --git a/src/LSG_Modal.h b/src/LSG_Modal.h
@@ -25,7 +25,6 @@ class LSG_Modal : public LSG_Text
 
 public:
 	static bool IsModalChild(LSG_Component* component);
-	static void SetVisible(LSG_Component* component, bool visible);
 
 public:
 	bool         CloseOnMouseClick(const SDL_Point& mousePosition);

diff --git a/src/main.cpp b/src/main.cpp
@@ -1474,10 +1474,7 @@ void LSG_SetVisible(const std::string& id, bool visible)
 	if (!component)
 		throw std::invalid_argument(getErrorNoID("", id));
 
-	if (component->IsModal())
-		LSG_Modal::SetVisible(component, visible);
-	else
-		component->visible = visible;
+	component->SetVisible(visible);
 
 	LSG_UI::LayoutRoot();
 }