cedric pushed a commit to branch master.
commit b4dfe38cc4b8b80ae23f9b07c3a91636c132c61f
Author: Cedric BAIL <[email protected]>
Date: Fri Mar 22 19:15:56 2013 +0900
elemines: use EFL 1.8 Edje improvement.
---
data/themes/default/default-big.edc | 67 ++++---------------------------------
data/themes/default/default.edc | 47 ++++----------------------
src/game.c | 8 ++---
src/main.c | 2 +-
4 files changed, 19 insertions(+), 105 deletions(-)
diff --git a/data/themes/default/default-big.edc
b/data/themes/default/default-big.edc
index 842e3cb..e9a39c8 100644
--- a/data/themes/default/default-big.edc
+++ b/data/themes/default/default-big.edc
@@ -157,76 +157,23 @@ collections {
table.homogeneous: TABLE;
}
-#define ITEM(X, Y, Source) \
+#define ITEM(X, Y, W, H, Source) \
item { \
- name: #X"/"#Y; \
type: GROUP; \
source: Source; \
position: X Y; \
weight: 1 1; \
align: -1 -1; \
+ spread: H W; \
}
-#define ITEM_TOP_BOTTOM(X) \
- ITEM(X, 0, "grass/s"); \
- ITEM(X, 11, "grass/n");
-
-#define LINE(Y) \
- ITEM(0, Y, "grass/w"); \
- ITEM(1, Y, "cell"); \
- ITEM(2, Y, "cell"); \
- ITEM(3, Y, "cell"); \
- ITEM(4, Y, "cell"); \
- ITEM(5, Y, "cell"); \
- ITEM(6, Y, "cell"); \
- ITEM(7, Y, "cell"); \
- ITEM(8, Y, "cell"); \
- ITEM(9, Y, "cell"); \
- ITEM(10, Y, "cell"); \
- ITEM(11, Y, "cell"); \
- ITEM(12, Y, "cell"); \
- ITEM(13, Y, "cell"); \
- ITEM(14, Y, "cell"); \
- ITEM(15, Y, "cell"); \
- ITEM(16, Y, "cell"); \
- ITEM(17, Y, "cell"); \
- ITEM(18, Y, "cell"); \
- ITEM(19, Y, "cell"); \
- ITEM(20, Y, "cell"); \
- ITEM(21, Y, "grass/e");
-
table {
items {
- ITEM_TOP_BOTTOM(1);
- ITEM_TOP_BOTTOM(2);
- ITEM_TOP_BOTTOM(3);
- ITEM_TOP_BOTTOM(4);
- ITEM_TOP_BOTTOM(5);
- ITEM_TOP_BOTTOM(6);
- ITEM_TOP_BOTTOM(7);
- ITEM_TOP_BOTTOM(8);
- ITEM_TOP_BOTTOM(9);
- ITEM_TOP_BOTTOM(10);
- ITEM_TOP_BOTTOM(11);
- ITEM_TOP_BOTTOM(12);
- ITEM_TOP_BOTTOM(13);
- ITEM_TOP_BOTTOM(14);
- ITEM_TOP_BOTTOM(15);
- ITEM_TOP_BOTTOM(16);
- ITEM_TOP_BOTTOM(17);
- ITEM_TOP_BOTTOM(18);
- ITEM_TOP_BOTTOM(19);
- ITEM_TOP_BOTTOM(20);
- LINE(1);
- LINE(2);
- LINE(3);
- LINE(4);
- LINE(5);
- LINE(6);
- LINE(7);
- LINE(8);
- LINE(9);
- LINE(10);
+ ITEM(1, 0, 20, 1, "grass/s");
+ ITEM(1, 11, 20, 1, "grass/n");
+ ITEM(1, 1, 20, 10, "cell");
+ ITEM(0, 1, 1, 10, "grass/w");
+ ITEM(11, 1, 1, 10, "grass/e");
}
}
}
diff --git a/data/themes/default/default.edc b/data/themes/default/default.edc
index 9d0cdcd..9ec8666 100644
--- a/data/themes/default/default.edc
+++ b/data/themes/default/default.edc
@@ -157,56 +157,23 @@ collections {
table.homogeneous: TABLE;
}
-#define ITEM(X, Y, Source) \
+#define ITEM(X, Y, W, H, Source) \
item { \
- name: #X"/"#Y; \
type: GROUP; \
source: Source; \
position: X Y; \
weight: 1 1; \
align: -1 -1; \
+ spread: W H; \
}
-#define ITEM_TOP_BOTTOM(X) \
- ITEM(X, 0, "grass/s"); \
- ITEM(X, 11, "grass/n");
-
-#define LINE(Y) \
- ITEM(0, Y, "grass/w"); \
- ITEM(1, Y, "cell"); \
- ITEM(2, Y, "cell"); \
- ITEM(3, Y, "cell"); \
- ITEM(4, Y, "cell"); \
- ITEM(5, Y, "cell"); \
- ITEM(6, Y, "cell"); \
- ITEM(7, Y, "cell"); \
- ITEM(8, Y, "cell"); \
- ITEM(9, Y, "cell"); \
- ITEM(10, Y, "cell"); \
- ITEM(11, Y, "grass/e");
-
table {
items {
- ITEM_TOP_BOTTOM(1);
- ITEM_TOP_BOTTOM(2);
- ITEM_TOP_BOTTOM(3);
- ITEM_TOP_BOTTOM(4);
- ITEM_TOP_BOTTOM(5);
- ITEM_TOP_BOTTOM(6);
- ITEM_TOP_BOTTOM(7);
- ITEM_TOP_BOTTOM(8);
- ITEM_TOP_BOTTOM(9);
- ITEM_TOP_BOTTOM(10);
- LINE(1);
- LINE(2);
- LINE(3);
- LINE(4);
- LINE(5);
- LINE(6);
- LINE(7);
- LINE(8);
- LINE(9);
- LINE(10);
+ ITEM(1, 0, 10, 1, "grass/s");
+ ITEM(1, 11, 10, 1, "grass/n");
+ ITEM(1, 1, 10, 10, "cell");
+ ITEM(0, 1, 1, 10, "grass/w");
+ ITEM(11, 1, 1, 10, "grass/e");
}
}
}
diff --git a/src/game.c b/src/game.c
index 17eb93b..4fa6ac2 100644
--- a/src/game.c
+++ b/src/game.c
@@ -238,7 +238,7 @@ _click(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
char str[128];
/* get back the coordinates of the cell */
- sscanf(source, "board[%i/%i]:overlay", &x, &y);
+ sscanf(source, "board[%i,%i]:overlay", &x, &y);
/* if we push 1st mouse button and there is no flag */
if (!strcmp(emission, "mouse,clicked,1") && matrix[x][y].flag == 0)
@@ -250,7 +250,7 @@ _click(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
game.clock.etimer = ecore_timer_add(dt, _timer, NULL);
}
- sprintf(str, "board[%i/%i]", x, y);
+ sprintf(str, "board[%i,%i]", x, y);
_clean_walk(str, x, y);
}
@@ -261,12 +261,12 @@ _click(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED,
{
if (!matrix[x][y].flag) /* set flag */
{
- sprintf(str, "board[%i/%i]:flag", x, y);
+ sprintf(str, "board[%i,%i]:flag", x, y);
game.datas.remain--;
}
else /* already a flag, remove it */
{
- sprintf(str, "board[%i/%i]:default", x, y);
+ sprintf(str, "board[%i,%i]:default", x, y);
game.datas.remain++;
}
matrix[x][y].flag = !matrix[x][y].flag;
diff --git a/src/main.c b/src/main.c
index c02d66c..d73200f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -55,7 +55,7 @@ _walk_iterator_next(Elemines_Iterator *it, void **data)
it->walker.cell = &matrix[it->col][it->row];
it->walker.x = it->col;
it->walker.y = it->row;
- sprintf((char*) it->walker.target, "board[%i/%i]", it->walker.x,
it->walker.y);
+ sprintf((char*) it->walker.target, "board[%i,%i]", it->walker.x,
it->walker.y);
it->col++;
if (it->col == it->x + it->width)
--
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
