hermet pushed a commit to branch master.
http://git.enlightenment.org/games/etypers.git/commit/?id=6466021ca54f60d44338d0751f470af9be50ba90
commit 6466021ca54f60d44338d0751f470af9be50ba90
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Feb 12 22:48:16 2016 +0900
support scalable screen.
u could use ELM_SCALE for this.
---
data/theme/etypers.edc | 1 +
src/bin/etypers.c | 18 +++++++++---------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/data/theme/etypers.edc b/data/theme/etypers.edc
index 8ed19e2..3adf278 100644
--- a/data/theme/etypers.edc
+++ b/data/theme/etypers.edc
@@ -177,6 +177,7 @@ collections {
}
part { name: "input_clipper";
type: RECT;
+ scale: 1;
description { state: "default" 0.0;
align: 0.5 1;
min: 120 30;
diff --git a/src/bin/etypers.c b/src/bin/etypers.c
index 7a1ba4a..a8df22c 100644
--- a/src/bin/etypers.c
+++ b/src/bin/etypers.c
@@ -1,7 +1,7 @@
#include <Elementary.h>
-#define DEFAULT_WIN_W 400
-#define DEFAULT_WIN_H 600
+#define DEFAULT_WIN_W ELM_SCALE_SIZE(400)
+#define DEFAULT_WIN_H ELM_SCALE_SIZE(600)
#define NEW_ENEMY_DURATION_SEC 5
#define LEVEL_INC_WEIGHT 0.01
#define DROP_DIST_WEIGHT 25
@@ -109,13 +109,13 @@ _enemy_new(Evas_Object *parent, const char *str,
Evas_Coord x, Evas_Coord y,
elm_object_text_set(entry, str);
//Prevent the text cutting out by the window bound
- //FIXME: TEXTBLOCK. Some words went outside of the textblock
Evas_Coord tb_w, tb_h;
Evas_Object *tb = elm_entry_textblock_get(entry);
evas_object_textblock_size_formatted_get(tb, &tb_w, &tb_h);
x = (x + tb_w) > max_w ? (x - ((x + tb_w) - max_w)) : x;
evas_object_move(entry, x, y);
- evas_object_resize(entry, tb_w + 10, tb_h);
+ //FIXME: TEXTBLOCK. Some words went outside of the textblock
+ evas_object_resize(entry, tb_w + ELM_SCALE_SIZE(10), tb_h);
evas_object_show(entry);
enemy->entry = entry;
@@ -162,7 +162,8 @@ _enemy_kill(AppData *appdata, Enemy *enemy)
elm_entry_text_style_user_push(entry, "DEFAULT='color=#FF0000'");
elm_transit_object_add(transit, entry);
elm_transit_duration_set(transit, 0.25);
- elm_transit_effect_translation_add(transit, 0, 0, 15, -20);
+ elm_transit_effect_translation_add(transit, 0, 0, ELM_SCALE_SIZE(15),
+ ELM_SCALE_SIZE(-20));
elm_transit_effect_color_add(transit, 255, 255, 255, 255, 0, 0, 0, 0);
elm_transit_del_cb_set(transit, _obj_del, entry);
elm_transit_go(transit);
@@ -378,7 +379,7 @@ _combo(AppData *appdata, Enemy *enemy, int combo)
if (!text) return;
evas_object_text_style_set(text, EVAS_TEXT_STYLE_PLAIN);
- evas_object_text_font_set(text, "Sans", 13);
+ evas_object_text_font_set(text, "Sans", ELM_SCALE_SIZE(12));
char buf[12];
snprintf(buf, sizeof(buf), "%dx Combo!!", combo);
@@ -387,7 +388,7 @@ _combo(AppData *appdata, Enemy *enemy, int combo)
Evas_Coord w, h;
evas_object_geometry_get(enemy->entry, NULL, NULL, &w, &h);
evas_object_move(text, (int) enemy->x, (int) enemy->y);
- evas_object_resize(text, 100, 20);
+ evas_object_resize(text, ELM_SCALE_SIZE(100), ELM_SCALE_SIZE(20));
evas_object_color_set(text, 255, 255, 0, 255);
evas_object_show(text);
@@ -767,7 +768,6 @@ _win_create(AppData *appdata)
//Fix the window size
Evas_Object *rect = evas_object_rectangle_add(evas_object_evas_get(win));
evas_object_size_hint_min_set(rect, DEFAULT_WIN_W, DEFAULT_WIN_H);
- evas_object_size_hint_max_set(rect, DEFAULT_WIN_W, DEFAULT_WIN_H);
elm_win_resize_object_add(win, rect);
return win;
@@ -815,7 +815,7 @@ _table_create(Evas_Object *ly, const char *part, AppData
*appdata)
Evas_Object *table = elm_table_add(ly);
if (!table) return NULL;
elm_table_homogeneous_set(table, EINA_TRUE);
- elm_table_padding_set(table, 1, 1);
+ elm_table_padding_set(table, ELM_SCALE_SIZE(1), ELM_SCALE_SIZE(1));
elm_object_part_content_set(ly, "defense_wall", table);
evas_object_show(table);
evas_object_event_callback_add(table, EVAS_CALLBACK_RESIZE,
_table_resize_cb,
--
