Mercurial > molko

changeset 155:13b7a1a4a72c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core: remove assets
author David Demelier <markand@malikania.fr>
date Fri, 16 Oct 2020 13:15:04 +0200
parents 2252f9efac9a
children c3a40062acc2
files libcore/CMakeLists.txt libcore/core/assets/fonts/comic-neue.ttf libcore/core/assets/fonts/f25-bank-printer.ttf libcore/core/assets/images/message.png libcore/core/assets/images/message.xcf libcore/core/assets/sprites/test-walk.xcf libui/CMakeLists.txt libui/ui/assets/fonts/opensans-light.ttf libui/ui/assets/fonts/opensans-regular.ttf libui/ui/debug.c libui/ui/theme.c
diffstat 11 files changed, 12 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/libcore/CMakeLists.txt	Fri Oct 16 13:04:48 2020 +0200
+++ b/libcore/CMakeLists.txt	Fri Oct 16 13:15:04 2020 +0200
@@ -19,13 +19,6 @@
 project(libcore)
 
 set(
-	ASSETS
-	${libcore_SOURCE_DIR}/core/assets/fonts/comic-neue.ttf
-	${libcore_SOURCE_DIR}/core/assets/fonts/f25-bank-printer.ttf
-	${libcore_SOURCE_DIR}/core/assets/images/message.png
-)
-
-set(
 	SOURCES
 	${libcore_SOURCE_DIR}/core/action.c
 	${libcore_SOURCE_DIR}/core/action.h
@@ -88,7 +81,6 @@
 molko_define_library(
 	TARGET libcore
 	SOURCES ${SOURCES}
-	ASSETS ${ASSETS}
 	LIBRARIES
 		libsqlite
 		SDL2::SDL2
Binary file libcore/core/assets/fonts/comic-neue.ttf has changed
Binary file libcore/core/assets/fonts/f25-bank-printer.ttf has changed
Binary file libcore/core/assets/images/message.png has changed
Binary file libcore/core/assets/images/message.xcf has changed
Binary file libcore/core/assets/sprites/test-walk.xcf has changed
--- a/libui/CMakeLists.txt	Fri Oct 16 13:04:48 2020 +0200
+++ b/libui/CMakeLists.txt	Fri Oct 16 13:15:04 2020 +0200
@@ -19,6 +19,12 @@
 project(libui)
 
 set(
+	ASSETS
+	${libui_SOURCE_DIR}/ui/assets/fonts/opensans-light.ttf
+	${libui_SOURCE_DIR}/ui/assets/fonts/opensans-regular.ttf
+)
+
+set(
 	SOURCES
 	${libui_SOURCE_DIR}/ui/align.c
 	${libui_SOURCE_DIR}/ui/align.h
@@ -39,6 +45,7 @@
 molko_define_library(
 	TARGET libui
 	SOURCES ${SOURCES}
+	ASSETS ${ASSETS}
 	LIBRARIES
 		libcore
 	PUBLIC_INCLUDES
Binary file libui/ui/assets/fonts/opensans-light.ttf has changed
Binary file libui/ui/assets/fonts/opensans-regular.ttf has changed
--- a/libui/ui/debug.c	Fri Oct 16 13:04:48 2020 +0200
+++ b/libui/ui/debug.c	Fri Oct 16 13:15:04 2020 +0200
@@ -68,7 +68,7 @@
 
 	/* Update font style. */
 	font_shallow(&font, theme->fonts[THEME_FONT_DEBUG]);
-	font.style = FONT_STYLE_NONE;
+	font.style = FONT_STYLE_ANTIALIASED;
 	font.color = theme->colors[THEME_COLOR_DEBUG];
 
 	if (!font_render(&font, &tex, line))
--- a/libui/ui/theme.c	Fri Oct 16 13:04:48 2020 +0200
+++ b/libui/ui/theme.c	Fri Oct 16 13:15:04 2020 +0200
@@ -27,8 +27,8 @@
 #include <core/texture.h>
 #include <core/util.h>
 
-#include <core/assets/fonts/f25-bank-printer.h>
-#include <core/assets/fonts/comic-neue.h>
+#include <ui/assets/fonts/opensans-light.h>
+#include <ui/assets/fonts/opensans-regular.h>
 
 #include "align.h"
 #include "button.h"
@@ -65,8 +65,8 @@
 	struct font **dest;
 	struct font font;
 } default_fonts[] = {
-	FONT(fonts_f25_bank_printer, 10, THEME_FONT_DEBUG),
-	FONT(fonts_comic_neue, 18, THEME_FONT_INTERFACE)
+	FONT(fonts_opensans_light, 12, THEME_FONT_DEBUG),
+	FONT(fonts_opensans_regular, 12, THEME_FONT_INTERFACE)
 };
 
 bool