[Scummvm-git-logs] scummvm master -> b8438436947dcb36ec049f1e5ff62009d7be643c

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
b843843694 IMGUI: Move MaterialSymbolsSharp.ttf into a separate archive


Commit: b8438436947dcb36ec049f1e5ff62009d7be643c
    https://github.com/scummvm/scummvm/commit/b8438436947dcb36ec049f1e5ff62009d7be643c
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2025-09-12T12:22:44+02:00

Commit Message:
IMGUI: Move MaterialSymbolsSharp.ttf into a separate archive

Changed paths:
  A dists/engine-data/fonts-imgui.dat
  A gui/themes/fonts-imgui/MaterialSymbolsSharp.ttf
  A gui/themes/fonts-imgui/version.txt
  R gui/themes/fonts/MaterialSymbolsSharp.ttf
    backends/imgui/imgui_fonts.cpp
    devtools/module.mk
    dists/engine-data/README
    dists/engine-data/engine_data.mk
    dists/irix/scummvm.idb
    gui/themes/fonts/README


diff --git a/backends/imgui/imgui_fonts.cpp b/backends/imgui/imgui_fonts.cpp
index d199ba95385..aef419212b4 100644
--- a/backends/imgui/imgui_fonts.cpp
+++ b/backends/imgui/imgui_fonts.cpp
@@ -80,11 +80,14 @@ ImFont *addTTFFontFromArchive(const char *filename, float size_pixels, const ImF
 	FontArchive archive;
 	FontReader reader(archive);
 
-	archive.openArchive("fonts.dat");
+	archive.openArchive("fonts-imgui.dat");
 	if (!reader.openFile(f, filename)) {
-		archive.openArchive("fonts-cjk.dat");
+		archive.openArchive("fonts.dat");
 		if (!reader.openFile(f, filename)) {
-			return nullptr;
+			archive.openArchive("fonts-cjk.dat");
+			if (!reader.openFile(f, filename)) {
+				return nullptr;
+			}
 		}
 	}
 
diff --git a/devtools/module.mk b/devtools/module.mk
index a85b6421497..05fe9cd94fb 100644
--- a/devtools/module.mk
+++ b/devtools/module.mk
@@ -52,6 +52,7 @@ wwwroot:
 fonts.dat:
 	$(srcdir)/devtools/make-fonts-archive.py $(srcdir)/gui/themes/fonts $(srcdir)/dists/engine-data/fonts.dat
 	$(srcdir)/devtools/make-fonts-archive.py $(srcdir)/gui/themes/fonts-cjk $(srcdir)/dists/engine-data/fonts-cjk.dat
+	$(srcdir)/devtools/make-fonts-archive.py $(srcdir)/gui/themes/fonts-imgui $(srcdir)/dists/engine-data/fonts-imgui.dat
 
 #
 # Rules to explicitly rebuild the credits / MD5 tables.
diff --git a/dists/engine-data/README b/dists/engine-data/README
index 31fa1400a95..1a68494852b 100644
--- a/dists/engine-data/README
+++ b/dists/engine-data/README
@@ -45,6 +45,11 @@ This file contains set of free CJK fonts (or other big ones), used in our GUI an
 some engines. This file is intended to be big, thus, not suitable for ports with
 memory constraints.
 
+fonts-imgui.dat:
+This file contains set of free symbol fonts (or other big ones), used by ImGui with
+some engines. This file is intended to be big, thus, not suitable for ports with
+memory constraints.
+
 got.gfx:
 This is a set of graphics for the title screen and main menu that were embedded in the executable.
 
diff --git a/dists/engine-data/engine_data.mk b/dists/engine-data/engine_data.mk
index 173d04da39b..dbe5527a65d 100644
--- a/dists/engine-data/engine_data.mk
+++ b/dists/engine-data/engine_data.mk
@@ -84,6 +84,9 @@ endif
 ifdef USE_FREETYPE2
 DIST_FILES_LIST += dists/engine-data/fonts.dat
 endif
+ifdef USE_IMGUI
+DIST_FILES_LIST += dists/engine-data/fonts-imgui.dat
+endif
 ifdef ENABLE_GRIM
 DIST_FILES_LIST += dists/engine-data/grim-patch.lab
 endif
diff --git a/dists/engine-data/fonts-imgui.dat b/dists/engine-data/fonts-imgui.dat
new file mode 100644
index 00000000000..984ca7cbb98
Binary files /dev/null and b/dists/engine-data/fonts-imgui.dat differ
diff --git a/dists/irix/scummvm.idb b/dists/irix/scummvm.idb
index acaaeb7e363..960ea239d69 100644
--- a/dists/irix/scummvm.idb
+++ b/dists/irix/scummvm.idb
@@ -28,6 +28,7 @@ f 0644 root sys usr/ScummVM/share/scummvm/drascula.dat drascula.dat scummvm.sw.e
 f 0644 root sys usr/ScummVM/share/scummvm/encoding.dat encoding.dat scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/fonts.dat fonts.dat scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/fonts-cjk.dat fonts-cjk.dat scummvm.sw.eoe
+f 0644 root sys usr/ScummVM/share/scummvm/fonts-imgui.dat fonts-imgui.dat scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/freescape.dat freescape.dat scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/got.aud got.aud scummvm.sw.eoe
 f 0644 root sys usr/ScummVM/share/scummvm/got.gfx got.gfx scummvm.sw.eoe
diff --git a/gui/themes/fonts/MaterialSymbolsSharp.ttf b/gui/themes/fonts-imgui/MaterialSymbolsSharp.ttf
similarity index 100%
rename from gui/themes/fonts/MaterialSymbolsSharp.ttf
rename to gui/themes/fonts-imgui/MaterialSymbolsSharp.ttf
diff --git a/gui/themes/fonts-imgui/version.txt b/gui/themes/fonts-imgui/version.txt
new file mode 100644
index 00000000000..b9b02375718
--- /dev/null
+++ b/gui/themes/fonts-imgui/version.txt
@@ -0,0 +1,2 @@
+1.0
+
diff --git a/gui/themes/fonts/README b/gui/themes/fonts/README
index ac76f3dc354..01b258bef1b 100644
--- a/gui/themes/fonts/README
+++ b/gui/themes/fonts/README
@@ -1,4 +1,4 @@
-These are fonts used in ScummVM, and are included in the fonts.dat and fonts-cjk.dat packages.
+These are fonts used in ScummVM, and are included in the fonts.dat, fonts-cjk.dat and fonts-imgui.dat packages.
 
 The Go Mono fonts (https://github.com/golang/image/blob/master/font/gofont/ttfs/README) are distributed under the license in COPYING.BSD.
 The Liberation fonts (https://github.com/liberationfonts) are distributed under the SIL Open Font License.