forked from enlightenment/efl
respect minw/h on load of edje file...
SVN revision: 7287
This commit is contained in:
parent
90de8fe0f4
commit
2b97e3a86a
|
@ -579,7 +579,7 @@ test_setup(char *file, char *name)
|
||||||
Evas_Object *o;
|
Evas_Object *o;
|
||||||
Demo_Edje *de;
|
Demo_Edje *de;
|
||||||
char buf[1024];
|
char buf[1024];
|
||||||
double tw, th;
|
double tw, th, w, h;
|
||||||
|
|
||||||
de = calloc(1, sizeof(Demo_Edje));
|
de = calloc(1, sizeof(Demo_Edje));
|
||||||
edjes = evas_list_append(edjes, de);
|
edjes = evas_list_append(edjes, de);
|
||||||
|
@ -661,9 +661,13 @@ test_setup(char *file, char *name)
|
||||||
edje_object_signal_callback_add(o, "do_it", "the_source", cb, NULL);
|
edje_object_signal_callback_add(o, "do_it", "the_source", cb, NULL);
|
||||||
edje_object_signal_callback_add(o, "mouse,*", "logo", cb, NULL);
|
edje_object_signal_callback_add(o, "mouse,*", "logo", cb, NULL);
|
||||||
evas_object_move(o, 10 + 10, 10 + 20);
|
evas_object_move(o, 10 + 10, 10 + 20);
|
||||||
evas_object_resize(o, 200, 240);
|
|
||||||
evas_object_show(o);
|
evas_object_show(o);
|
||||||
edje_object_size_min_get(o, &(de->minw), &(de->minh));
|
edje_object_size_min_get(o, &(de->minw), &(de->minh));
|
||||||
|
w = 200;
|
||||||
|
h = 240;
|
||||||
|
if (200 < de->minw) w = de->minw;
|
||||||
|
if (240 < de->minh) h = de->minh;
|
||||||
|
evas_object_resize(o, w, h);
|
||||||
de->edje = o;
|
de->edje = o;
|
||||||
|
|
||||||
/* test swallowing */
|
/* test swallowing */
|
||||||
|
|
|
@ -27,8 +27,6 @@
|
||||||
*
|
*
|
||||||
* more example edje files
|
* more example edje files
|
||||||
*
|
*
|
||||||
* edje test program needs to test all api calls and list edje collections
|
|
||||||
*
|
|
||||||
* ? programs need to be able to cycle part states given a list of states
|
* ? programs need to be able to cycle part states given a list of states
|
||||||
* ? programs need to be able to set/get/add/sub and compare variables
|
* ? programs need to be able to set/get/add/sub and compare variables
|
||||||
* ie:
|
* ie:
|
||||||
|
|
Loading…
Reference in New Issue