Commit: 1430affe88eafca84d971a0c065bdd0e91ee0414 - turbobadger (git)

Small footprint UI library for hardware accelerated games & applications

Commit MetaInfo

• Revision: 1430affe88eafca84d971a0c065bdd0e91ee0414 (tree)
• Zeit: 2016-12-22 05:29:38
• Autor: Emil Segerås <emilsegers@gmai...>
• Commiter: Emil Segerås

Log Message

TBSkin::Load should be callable multiple times.

Ändern Zusammenfassung

• modified: src/tb/tb_skin.cpp
• modified: src/tb/tb_skin.h

Diff

--- a/src/tb/tb_skin.cpp
+++ b/src/tb/tb_skin.cpp
@@ -128,6 +128,12 @@ TBSkin::TBSkin()
 
 bool TBSkin::Load(const char *skin_file, const char *override_skin_file)
 {
+	// Clear and previously loaded data.
+	UnloadBitmaps();
+	m_elements.DeleteAll();
+	m_shape_nodes.Clear();
+
+	// Load
 	if (!LoadInternal(skin_file))
 		return false;
 	if (override_skin_file && !LoadInternal(override_skin_file))

--- a/src/tb/tb_skin.h
+++ b/src/tb/tb_skin.h
@@ -303,6 +303,8 @@ public:
 		If the skin use font glyphs, the font engine and used font has to be initialized
 		already. Otherwise the correct font won't be used.
 
+		May be called multiple times to reload skin.
+
 		Returns true on success, and all bitmaps referred to also loaded successfully. */
 	bool Load(const char *skin_file, const char *override_skin_file = nullptr);