enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 13
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

oopsie - fix gadman zone fetch res match 

SVN revision: 16759
This commit is contained in:
Carsten Haitzler 2005-09-19 04:28:22 +00:00
parent 0cbbecb698
commit 146ffd74d9
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/bin/e_dialog.c
View File

@ -8,7 +8,7 @@ typedef struct _E_Dialog_Button E_Dialog_Button;
struct _E_Dialog_Button struct _E_Dialog_Button
{ {
E_Dialog *dialog; E_Dialog *dialog;
Evas_Object *obj; Evas_Object *obj, *obj_icon;
char *label; char *label;
char *icon; char *icon;
void (*func) (void *data, E_Dialog *dia); void (*func) (void *data, E_Dialog *dia);
@ -92,6 +92,16 @@ e_dialog_button_add(E_Dialog *dia, char *label, char *icon, void (*func) (void *
edje_object_signal_callback_add(db->obj, "click", "", edje_object_signal_callback_add(db->obj, "click", "",
_e_dialog_cb_button_clicked, db); _e_dialog_cb_button_clicked, db);
edje_object_part_text_set(db->obj, "button_text", db->label); edje_object_part_text_set(db->obj, "button_text", db->label);
if (icon)
{
db->obj_icon = edje_object_add(e_win_evas_get(dia->win));
e_util_edje_icon_set(db->obj_icon, icon);
edje_object_part_swallow(db->obj, "icon_swallow", db->obj_icon);
edje_object_signal_emit(db->obj, "icon_visible", "");
edje_object_message_signal_process(db->obj);
evas_object_show(db->obj_icon);
}
edje_object_calc_force(db->obj);
edje_object_size_min_calc(db->obj, &mw, &mh); edje_object_size_min_calc(db->obj, &mw, &mh);
e_box_pack_end(dia->box_object, db->obj); e_box_pack_end(dia->box_object, db->obj);
e_box_pack_options_set(db->obj, e_box_pack_options_set(db->obj,
@ -160,6 +170,7 @@ _e_dialog_free(E_Dialog *dia)
E_FREE(db->label); E_FREE(db->label);
E_FREE(db->icon); E_FREE(db->icon);
evas_object_del(db->obj); evas_object_del(db->obj);
if (db->obj_icon) evas_object_del(db->obj_icon);
free(db); free(db);
} }
if (dia->text_object) evas_object_del(dia->text_object); if (dia->text_object) evas_object_del(dia->text_object);

3
src/bin/e_gadman.c
View File

@ -282,6 +282,8 @@ e_gadman_client_load(E_Gadman_Client *gmc)
{ {
cf2 = (Gadman_Client_Config *)l->data; cf2 = (Gadman_Client_Config *)l->data;
zone = e_container_zone_number_get(gmc->zone->container, cf2->zone); zone = e_container_zone_number_get(gmc->zone->container, cf2->zone);
if (zone)
{
if ((zone->w == cf2->res.w) && (zone->h == cf2->res.h)) if ((zone->w == cf2->res.w) && (zone->h == cf2->res.h))
{ {
l = cf->res.others; l = cf->res.others;
@ -290,6 +292,7 @@ e_gadman_client_load(E_Gadman_Client *gmc)
break; break;
} }
} }
}
E_CONFIG_LIMIT(cf->pos.x, 0, 10000); E_CONFIG_LIMIT(cf->pos.x, 0, 10000);
E_CONFIG_LIMIT(cf->pos.y, 0, 10000); E_CONFIG_LIMIT(cf->pos.y, 0, 10000);
E_CONFIG_LIMIT(cf->pos.w, 1, 10000); E_CONFIG_LIMIT(cf->pos.w, 1, 10000);

5
src/bin/e_test.c
View File

@ -300,9 +300,10 @@ _e_test_internal(E_Container *con)
e_object_del_attach_func_set(E_OBJECT(dia), _e_test_dialog_del); e_object_del_attach_func_set(E_OBJECT(dia), _e_test_dialog_del);
e_dialog_title_set(dia, "A Test Dialog"); e_dialog_title_set(dia, "A Test Dialog");
e_dialog_text_set(dia, "A Test Dialog<br>And another line<br><hilight>Hilighted Text</hilight>"); e_dialog_text_set(dia, "A Test Dialog<br>And another line<br><hilight>Hilighted Text</hilight>");
e_dialog_icon_set(dia, "enlightenment/modules");
e_dialog_button_add(dia, "OK", NULL, NULL, NULL); e_dialog_button_add(dia, "OK", NULL, NULL, NULL);
e_dialog_button_add(dia, "Apply", NULL, NULL, NULL); e_dialog_button_add(dia, "Apply", "enlightenment/reset", NULL, NULL);
e_dialog_button_add(dia, "Cancel", NULL, NULL, NULL); e_dialog_button_add(dia, "Cancel", "enlightenment/exit", NULL, NULL);
e_dialog_show(dia); e_dialog_show(dia);
} }
#elif 0 #elif 0