Mercurial > molko

changeset 487:f2d3c5a97884

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui: align -> mlk_align
author David Demelier <markand@malikania.fr>
date Tue, 28 Feb 2023 13:08:58 +0100
parents d6757c30658e
children 441c37e7474f
files examples/example-action/example-action.c examples/example-gridmenu/example-gridmenu.c examples/example-label/example-label.c examples/example-sprite/example-sprite.c examples/example-ui/example-ui.c libmlk-example/mlk/example/spell-fire.c libmlk-rpg/mlk/rpg/battle-bar-default.c libmlk-rpg/mlk/rpg/battle-message.c libmlk-rpg/mlk/rpg/message.c libmlk-ui/mlk/ui/align.c libmlk-ui/mlk/ui/align.h libmlk-ui/mlk/ui/button.c libmlk-ui/mlk/ui/notify.c
diffstat 13 files changed, 51 insertions(+), 52 deletions(-) [+]
line wrap: on
line diff
--- a/examples/example-action/example-action.c	Tue Feb 28 13:04:13 2023 +0100
+++ b/examples/example-action/example-action.c	Tue Feb 28 13:08:58 2023 +0100
@@ -250,9 +250,9 @@
 	const unsigned int cw = registry_sprites[REGISTRY_TEXTURE_CHEST].cellw;
 	const unsigned int ch = registry_sprites[REGISTRY_TEXTURE_CHEST].cellh;
 
-	align(ALIGN_CENTER, &chests[0].x, &chests[0].y, cw, ch,
+	mlk_align(MLK_ALIGN_CENTER, &chests[0].x, &chests[0].y, cw, ch,
 	    0, 0, MLK_EXAMPLE_W / 2, MLK_EXAMPLE_H);
-	align(ALIGN_CENTER, &chests[1].x, &chests[1].y, cw, ch,
+	mlk_align(MLK_ALIGN_CENTER, &chests[1].x, &chests[1].y, cw, ch,
 	    MLK_EXAMPLE_W / 2, 0, MLK_EXAMPLE_W / 2, MLK_EXAMPLE_H);
 
 	chests[0].run = script_left_run;
@@ -268,7 +268,7 @@
 	unsigned int lw, lh;
 
 	label_query(&label, &lw, &lh);
-	align(ALIGN_CENTER, &label.x, &label.y, lw, lh,
+	mlk_align(MLK_ALIGN_CENTER, &label.x, &label.y, lw, lh,
 	    0, 0, MLK_EXAMPLE_W, MLK_EXAMPLE_H / 2);
 }
 
--- a/examples/example-gridmenu/example-gridmenu.c	Tue Feb 28 13:04:13 2023 +0100
+++ b/examples/example-gridmenu/example-gridmenu.c	Tue Feb 28 13:08:58 2023 +0100
@@ -114,7 +114,7 @@
 	gridmenu_init(&menu, 3, 2, items, MLK_UTIL_SIZE(items));
 	gridmenu_resize(&menu, 0, 0, 300, 100);
 
-	align(ALIGN_CENTER, &menu.x, &menu.y, menu.w, menu.h, 0, 0, mlk_window.w, mlk_window.h);
+	mlk_align(MLK_ALIGN_CENTER, &menu.x, &menu.y, menu.w, menu.h, 0, 0, mlk_window.w, mlk_window.h);
 
 	mlk_game_init(states, MLK_UTIL_SIZE(states));
 	mlk_game_push(&state);
--- a/examples/example-label/example-label.c	Tue Feb 28 13:04:13 2023 +0100
+++ b/examples/example-label/example-label.c	Tue Feb 28 13:08:58 2023 +0100
@@ -37,59 +37,59 @@
 #include <mlk/example/example.h>
 
 struct {
-	enum align align;
+	enum mlk_align align;
 	struct label label;
 } table[] = {
 	{
-		.align = ALIGN_TOP_LEFT,
+		.align = MLK_ALIGN_TOP_LEFT,
 		.label = {
 			.text = "Top left"
 		}
 	},
 	{
-		.align = ALIGN_TOP,
+		.align = MLK_ALIGN_TOP,
 		.label = {
 			.text = "Top",
 		}
 	},
 	{
-		.align = ALIGN_TOP_RIGHT,
+		.align = MLK_ALIGN_TOP_RIGHT,
 		.label = {
 			.text = "Top right",
 		}
 	},
 	{
-		.align = ALIGN_RIGHT,
+		.align = MLK_ALIGN_RIGHT,
 		.label = {
 			.text = "Right",
 		}
 	},
 	{
-		.align = ALIGN_BOTTOM_RIGHT,
+		.align = MLK_ALIGN_BOTTOM_RIGHT,
 		.label = {
 			.text = "Bottom right",
 		}
 	},
 	{
-		.align = ALIGN_BOTTOM,
+		.align = MLK_ALIGN_BOTTOM,
 		.label = {
 			.text = "Bottom",
 		}
 	},
 	{
-		.align = ALIGN_BOTTOM_LEFT,
+		.align = MLK_ALIGN_BOTTOM_LEFT,
 		.label = {
 			.text = "Bottom left",
 		}
 	},
 	{
-		.align = ALIGN_LEFT,
+		.align = MLK_ALIGN_LEFT,
 		.label = {
 			.text = "Left",
 		}
 	},
 	{
-		.align = ALIGN_CENTER,
+		.align = MLK_ALIGN_CENTER,
 		.label = {
 			.text = "The world is Malikania.",
 			.flags = LABEL_FLAGS_SHADOW
@@ -116,7 +116,7 @@
 		unsigned int w, h;
 
 		label_query(l, &w, &h);
-		align(table[i].align, &l->x, &l->y, w, h, 0, 0, mlk_window.w, mlk_window.h);
+		mlk_align(table[i].align, &l->x, &l->y, w, h, 0, 0, mlk_window.w, mlk_window.h);
 	}
 }
 
--- a/examples/example-sprite/example-sprite.c	Tue Feb 28 13:04:13 2023 +0100
+++ b/examples/example-sprite/example-sprite.c	Tue Feb 28 13:08:58 2023 +0100
@@ -119,7 +119,7 @@
 
 	mlk_painter_set_color(0xebede9ff);
 	mlk_painter_clear();
-	align(ALIGN_CENTER, &x, &y, sprite->cellw, sprite->cellh, 0, 0, mlk_window.w, mlk_window.h);
+	mlk_align(MLK_ALIGN_CENTER, &x, &y, sprite->cellw, sprite->cellh, 0, 0, mlk_window.w, mlk_window.h);
 	mlk_sprite_draw(sprite, row, column, x, y);
 	label_draw(&help);
 	mlk_painter_present();
--- a/examples/example-ui/example-ui.c	Tue Feb 28 13:04:13 2023 +0100
+++ b/examples/example-ui/example-ui.c	Tue Feb 28 13:08:58 2023 +0100
@@ -138,7 +138,7 @@
 
 	/* Header. */
 	label_query(l, &w, &h);
-	align(ALIGN_LEFT, &l->x, &l->y, w, h, f->x, f->y, f->w, HEADER_HEIGHT);
+	mlk_align(MLK_ALIGN_LEFT, &l->x, &l->y, w, h, f->x, f->y, f->w, HEADER_HEIGHT);
 
 	l->x += theme_default()->padding;
 }
@@ -168,7 +168,7 @@
 	/* Button. */
 	b->w = f->w / 4;
 
-	align(ALIGN_BOTTOM_RIGHT, &b->x, &b->y, b->w, b->h,
+	mlk_align(MLK_ALIGN_BOTTOM_RIGHT, &b->x, &b->y, b->w, b->h,
 	    f->x, f->y, f->w, f->h);
 
 	b->x -= padding;
--- a/libmlk-example/mlk/example/spell-fire.c	Tue Feb 28 13:04:13 2023 +0100
+++ b/libmlk-example/mlk/example/spell-fire.c	Tue Feb 28 13:08:58 2023 +0100
@@ -58,7 +58,7 @@
 	const struct mlk_sprite *sprite = et->ch->sprites[CHARACTER_SPRITE_NORMAL];
 	int x, y;
 
-	align(ALIGN_CENTER,
+	mlk_align(MLK_ALIGN_CENTER,
 	    &x, &y, self->animation.sprite->cellw, self->animation.sprite->cellh,
 	    et->x, et->y, sprite->cellw, sprite->cellh);
 
--- a/libmlk-rpg/mlk/rpg/battle-bar-default.c	Tue Feb 28 13:04:13 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-bar-default.c	Tue Feb 28 13:08:58 2023 +0100
@@ -320,32 +320,32 @@
 {
 	struct {
 		unsigned int w, h;
-		enum align align;
+		enum mlk_align align;
 		struct label label;
 	} buttons[] = {
 		{
-			.align = ALIGN_TOP,
+			.align = MLK_ALIGN_TOP,
 			.label = {
 				.text = "Attack",
 				.flags = LABEL_FLAGS_SHADOW
 			}
 		},
 		{
-			.align = ALIGN_RIGHT,
+			.align = MLK_ALIGN_RIGHT,
 			.label = {
 				.text = "Magic",
 				.flags = LABEL_FLAGS_SHADOW
 			}
 		},
 		{
-			.align = ALIGN_BOTTOM,
+			.align = MLK_ALIGN_BOTTOM,
 			.label = {
 				.text = "Objects",
 				.flags = LABEL_FLAGS_SHADOW
 			}
 		},
 		{
-			.align = ALIGN_LEFT,
+			.align = MLK_ALIGN_LEFT,
 			.label = {
 				.text = "Special",
 				.flags = LABEL_FLAGS_SHADOW
@@ -382,7 +382,7 @@
 		else
 			buttons[i].label.flags &= ~LABEL_FLAGS_SELECTED;
 
-		align(buttons[i].align,
+		mlk_align(buttons[i].align,
 		    &buttons[i].label.x, &buttons[i].label.y, buttons[i].w, buttons[i].h,
 		    bx, by, bw, bh);
 		label_draw(&buttons[i].label);
--- a/libmlk-rpg/mlk/rpg/battle-message.c	Tue Feb 28 13:04:13 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-message.c	Tue Feb 28 13:08:58 2023 +0100
@@ -53,7 +53,7 @@
 	f.theme = msg->theme;
 
 	/* Center on top. */
-	align(ALIGN_TOP, &f.x, &f.y, f.w, f.h, 0, 20, mlk_window.w, mlk_window.h);
+	mlk_align(MLK_ALIGN_TOP, &f.x, &f.y, f.w, f.h, 0, 20, mlk_window.w, mlk_window.h);
 
 	/* Prepare message label box. */
 	l.text = msg->text;
@@ -62,7 +62,7 @@
 	label_query(&l, &lw, &lh);
 
 	/* Align the text in the box. */
-	align(ALIGN_CENTER, &l.x, &l.y, lw, lh, f.x, f.y, f.w, f.h);
+	mlk_align(MLK_ALIGN_CENTER, &l.x, &l.y, lw, lh, f.x, f.y, f.w, f.h);
 
 	frame_draw(&f);
 	label_draw(&l);
--- a/libmlk-rpg/mlk/rpg/message.c	Tue Feb 28 13:04:13 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/message.c	Tue Feb 28 13:08:58 2023 +0100
@@ -260,7 +260,7 @@
 	h = msg->h * msg->scale;
 
 	/* Centerize within its drawing area. */
-	align(ALIGN_CENTER, &x, &y, w, h, msg->x, msg->y, msg->w, msg->h);
+	mlk_align(MLK_ALIGN_CENTER, &x, &y, w, h, msg->x, msg->y, msg->w, msg->h);
 
 	/* Draw and clear. */
 	mlk_texture_scale(&tex, 0, 0, msg->w, msg->h, x, y, w, h, 0);
--- a/libmlk-ui/mlk/ui/align.c	Tue Feb 28 13:04:13 2023 +0100
+++ b/libmlk-ui/mlk/ui/align.c	Tue Feb 28 13:08:58 2023 +0100
@@ -22,7 +22,7 @@
 #define CENTER(p, c, rs, es) if (p) (*p) = c + (rs / 2) - (es / 2)
 
 void
-align(enum align align,
+mlk_align(enum mlk_align align,
       int *x,
       int *y,
       unsigned int w,
@@ -33,39 +33,39 @@
       unsigned int ph)
 {
 	switch (align) {
-	case ALIGN_CENTER:
+	case MLK_ALIGN_CENTER:
 		CENTER(x, px, pw, w);
 		CENTER(y, py, ph, h);
 		break;
-	case ALIGN_TOP_LEFT:
+	case MLK_ALIGN_TOP_LEFT:
 		SET(x, px);
 		SET(y, py);
 		break;
-	case ALIGN_TOP:
+	case MLK_ALIGN_TOP:
 		CENTER(x, px, pw, w);
 		SET(y, py);
 		break;
-	case ALIGN_TOP_RIGHT:
+	case MLK_ALIGN_TOP_RIGHT:
 		SET(x, px + pw - w);
 		SET(y, py);
 		break;
-	case ALIGN_RIGHT:
+	case MLK_ALIGN_RIGHT:
 		SET(x, px + pw - w);
 		CENTER(y, py, ph, h);
 		break;
-	case ALIGN_BOTTOM_RIGHT:
+	case MLK_ALIGN_BOTTOM_RIGHT:
 		SET(x, px + pw - w);
 		SET(y, py + ph - h);
 		break;
-	case ALIGN_BOTTOM:
+	case MLK_ALIGN_BOTTOM:
 		CENTER(x, px, pw, w);
 		SET(y, py + ph - h);
 		break;
-	case ALIGN_BOTTOM_LEFT:
+	case MLK_ALIGN_BOTTOM_LEFT:
 		SET(x, px);
 		SET(y, py + ph - h);
 		break;
-	case ALIGN_LEFT:
+	case MLK_ALIGN_LEFT:
 		CENTER(y, py, ph, h);
 		SET(x, px);
 		break;
--- a/libmlk-ui/mlk/ui/align.h	Tue Feb 28 13:04:13 2023 +0100
+++ b/libmlk-ui/mlk/ui/align.h	Tue Feb 28 13:08:58 2023 +0100
@@ -21,23 +21,22 @@
 
 #include <mlk/core/core.h>
 
-enum align {
-	ALIGN_NONE,
-	ALIGN_CENTER,
-	ALIGN_TOP_LEFT,
-	ALIGN_TOP,
-	ALIGN_TOP_RIGHT,
-	ALIGN_RIGHT,
-	ALIGN_BOTTOM_RIGHT,
-	ALIGN_BOTTOM,
-	ALIGN_BOTTOM_LEFT,
-	ALIGN_LEFT
+enum mlk_align {
+	MLK_ALIGN_CENTER,
+	MLK_ALIGN_TOP_LEFT,
+	MLK_ALIGN_TOP,
+	MLK_ALIGN_TOP_RIGHT,
+	MLK_ALIGN_RIGHT,
+	MLK_ALIGN_BOTTOM_RIGHT,
+	MLK_ALIGN_BOTTOM,
+	MLK_ALIGN_BOTTOM_LEFT,
+	MLK_ALIGN_LEFT
 };
 
 MLK_CORE_BEGIN_DECLS
 
 void
-align(enum align,
+mlk_align(enum mlk_align,
       int *,
       int *,
       unsigned int,
--- a/libmlk-ui/mlk/ui/button.c	Tue Feb 28 13:04:13 2023 +0100
+++ b/libmlk-ui/mlk/ui/button.c	Tue Feb 28 13:08:58 2023 +0100
@@ -60,7 +60,7 @@
 	if (lh > button->h)
 		mlk_tracef("button height is too small for text: %u < %u", button->h, lh);
 
-	align(ALIGN_CENTER, &label.x, &label.y, lw, lh,
+	mlk_align(MLK_ALIGN_CENTER, &label.x, &label.y, lw, lh,
 	    button->x, button->y, button->w, button->h);
 
 	mlk_painter_set_color(0x577277ff);
--- a/libmlk-ui/mlk/ui/notify.c	Tue Feb 28 13:04:13 2023 +0100
+++ b/libmlk-ui/mlk/ui/notify.c	Tue Feb 28 13:08:58 2023 +0100
@@ -84,7 +84,7 @@
 		geo->icon_x = x + geo->theme->padding;
 		geo->icon_y = y + geo->theme->padding;
 	} else {
-		align(ALIGN_LEFT, &geo->icon_x, &geo->icon_y, n->icon->w, n->icon->h, x, y, WIDTH, HEIGHT);
+		mlk_align(MLK_ALIGN_LEFT, &geo->icon_x, &geo->icon_y, n->icon->w, n->icon->h, x, y, WIDTH, HEIGHT);
 		geo->icon_x += geo->icon_y - y;
 	}