Merge pull request #791 from AllenDang/fix-panic-and-font-alats

Fix panic and font alats
AllenDang · May 3, 2024 · d649def · d649def
2 parents 825a30a + 314daa2
commit d649def
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/FontAtlasProsessor.go b/FontAtlasProsessor.go
@@ -242,7 +242,7 @@ func (a *FontAtlas) rebuildFontAtlas() {
 	}
 
 	fonts := Context.IO().Fonts()
-	// fonts.Clear() /// TODO: I'm commenting this out, because it produces panic.
+	fonts.Clear()
 
 	var sb strings.Builder
 

diff --git a/Keycode.go b/Keycode.go
@@ -122,6 +122,7 @@ const (
 	KeyMenu           = Key(imgui.KeyMenu)
 	KeyWorld1         = Key(imgui.GLFWKeyWorld1)
 	KeyWorld2         = Key(imgui.GLFWKeyWorld2)
+	KeyUnknown        = Key(-1)
 )
 
 // refer glfw3.h.
@@ -234,6 +235,7 @@ func keyFromGLFWKey(k imgui.GLFWKey) Key {
 		imgui.GLFWKeyMenu:         KeyMenu,
 		imgui.GLFWKeyWorld1:       KeyWorld1,
 		imgui.GLFWKeyWorld2:       KeyWorld2,
+		-1:                        KeyUnknown,
 	}
 
 	if v, ok := data[k]; ok {