forked from enlightenment/efl
parent
395743c598
commit
181da0cf37
|
@ -20,7 +20,7 @@ collections
|
|||
part
|
||||
{
|
||||
name, "background";
|
||||
// IMAGE, RECTANGLE, TEXT
|
||||
// IMAGE, RECT, TEXT
|
||||
// type, IMAGE;
|
||||
// for text only really
|
||||
// NONE, PLAIN, OUTLINE, SOFT_OUTLINE, SHADOW, SOFT_SHADOW, OUTLINE_SHADOW,
|
||||
|
|
|
@ -58,7 +58,7 @@ main_start(int argc, char **argv)
|
|||
ecore_evas_name_class_set(ecore_evas, "edje", "main");
|
||||
ecore_evas_show(ecore_evas);
|
||||
evas = ecore_evas_get(ecore_evas);
|
||||
evas_image_cache_set(evas, 8 * 1024 * 1024);
|
||||
evas_image_cache_set(evas, 16 * 1024 * 1024);
|
||||
evas_font_cache_set(evas, 1 * 1024 * 1024);
|
||||
evas_font_path_append(evas, DAT"data/test/fonts");
|
||||
return 1;
|
||||
|
@ -147,36 +147,36 @@ bg_key_down(void *data, Evas * e, Evas_Object * obj, void *event_info)
|
|||
Demo_Edje *de;
|
||||
|
||||
de = l->data;
|
||||
if (!strcmp(ev->keyname, "p"))
|
||||
if (!strcmp(ev->keyname, "Return"))
|
||||
edje_object_play_set(de->edje, 1);
|
||||
else if (!strcmp(ev->keyname, "o"))
|
||||
else if (!strcmp(ev->keyname, "Escape"))
|
||||
edje_object_play_set(de->edje, 0);
|
||||
else if (!strcmp(ev->keyname, "a"))
|
||||
edje_object_animation_set(de->edje, 1);
|
||||
else if (!strcmp(ev->keyname, "s"))
|
||||
edje_object_animation_set(de->edje, 0);
|
||||
else if (!strcmp(ev->keyname, "t"))
|
||||
else if (!strcmp(ev->keyname, "Left"))
|
||||
edje_object_part_text_set(de->edje, "text", "String 1");
|
||||
else if (!strcmp(ev->keyname, "y"))
|
||||
else if (!strcmp(ev->keyname, "Up"))
|
||||
edje_object_part_text_set(de->edje, "text", "Buttox");
|
||||
else if (!strcmp(ev->keyname, "u"))
|
||||
else if (!strcmp(ev->keyname, "Right"))
|
||||
edje_object_part_text_set(de->edje, "text", "You pressed \"U\". Nice one stenchie!");
|
||||
else if (!strcmp(ev->keyname, "q"))
|
||||
else if (!strcmp(ev->keyname, "F1"))
|
||||
edje_object_color_class_set(de->edje, "bg",
|
||||
255, 255, 255, 255,
|
||||
0, 0, 0, 0,
|
||||
0, 0, 0, 0);
|
||||
else if (!strcmp(ev->keyname, "w"))
|
||||
else if (!strcmp(ev->keyname, "F2"))
|
||||
edje_object_color_class_set(de->edje, "bg",
|
||||
255, 200, 120, 255,
|
||||
0, 0, 0, 0,
|
||||
0, 0, 0, 0);
|
||||
else if (!strcmp(ev->keyname, "e"))
|
||||
else if (!strcmp(ev->keyname, "F3"))
|
||||
edje_object_color_class_set(de->edje, "bg",
|
||||
120, 200, 255, 200,
|
||||
0, 0, 0, 0,
|
||||
0, 0, 0, 0);
|
||||
else if (!strcmp(ev->keyname, "r"))
|
||||
else if (!strcmp(ev->keyname, "F4"))
|
||||
edje_object_color_class_set(de->edje, "bg",
|
||||
255, 200, 50, 100,
|
||||
0, 0, 0, 0,
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
* real part size and "before min/max limit" sizes need to be stored per part
|
||||
* need to be able to calculate min & max size of a whole edje
|
||||
*
|
||||
* swallowed objects need to be able to adversize min/max size
|
||||
* swallowed objects need to be able to advertise min/max size
|
||||
*
|
||||
* need to be able to list collections in an eet file
|
||||
*
|
||||
|
|
|
@ -290,6 +290,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
|
|||
if ((psize - size) <= 0) size = psize - 1;
|
||||
evas_object_text_font_set(ep->object, font, size);
|
||||
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
|
||||
if ((size > 0) && (tw == 0)) break;
|
||||
}
|
||||
}
|
||||
else if (tw < sw)
|
||||
|
@ -304,6 +305,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
|
|||
if ((psize - size) >= 0) size = psize + 1;
|
||||
evas_object_text_font_set(ep->object, font, size);
|
||||
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
|
||||
if ((size > 0) && (tw == 0)) break;
|
||||
}
|
||||
size = psize;
|
||||
}
|
||||
|
@ -317,14 +319,17 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
|
|||
if (th < sh)
|
||||
{
|
||||
int dif;
|
||||
double change;
|
||||
|
||||
dif = (th - sh) / 4;
|
||||
if (dif < 1) dif = 1;
|
||||
change = 0;
|
||||
while ((th < sh) && (sw > 0.0))
|
||||
{
|
||||
size += dif;
|
||||
evas_object_text_font_set(ep->object, font, size);
|
||||
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
|
||||
if ((size > 0) && (th == 0)) break;
|
||||
}
|
||||
size -= dif;
|
||||
}
|
||||
|
@ -339,6 +344,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
|
|||
size -= dif;
|
||||
evas_object_text_font_set(ep->object, font, size);
|
||||
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
|
||||
if ((size > 0) && (th == 0)) break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue