Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c e_apps.h e_border.c e_eap_editor.c e_exebuf.c e_fm.c
e_fwin.c e_init.c e_int_border_menu.c e_int_config_modules.c
e_int_menus.c e_module.c
Log Message:
Fix border icon drag.
e_app_* functions should have E_App arg first.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -3 -r1.247 -r1.248
--- e_apps.c 14 Dec 2006 15:28:27 -0000 1.247
+++ e_apps.c 28 Dec 2006 13:43:30 -0000 1.248
@@ -2222,7 +2222,7 @@
}
EAPI Evas_Object *
-e_app_icon_add(Evas *evas, E_App *a)
+e_app_icon_add(E_App *a, Evas *evas)
{
Evas_Object *o = NULL;
E_App_Icon_Type type;
@@ -2281,7 +2281,7 @@
*/
EAPI void
-e_app_icon_add_to_menu_item(E_Menu_Item *mi, E_App *a)
+e_app_icon_add_to_menu_item(E_App *a, E_Menu_Item *mi)
{
E_App_Icon_Type type;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- e_apps.h 22 Oct 2006 02:14:08 -0000 1.50
+++ e_apps.h 28 Dec 2006 13:43:30 -0000 1.51
@@ -162,8 +162,8 @@
EAPI Ecore_List *e_app_dir_file_list_get (E_App *a);
EAPI void e_app_fields_empty (E_App *a);
EAPI int e_app_valid_exe_get (E_App *a);
-EAPI Evas_Object *e_app_icon_add (Evas *evas, E_App
*a);
-EAPI void e_app_icon_add_to_menu_item (E_Menu_Item *mi,
E_App *a);
+EAPI Evas_Object *e_app_icon_add (E_App *a, Evas
*evas);
+EAPI void e_app_icon_add_to_menu_item (E_App *a,
E_Menu_Item *mi);
#endif
#endif
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.562
retrieving revision 1.563
diff -u -3 -r1.562 -r1.563
--- e_border.c 16 Dec 2006 21:28:45 -0000 1.562
+++ e_border.c 28 Dec 2006 13:43:30 -0000 1.563
@@ -2565,7 +2565,7 @@
{
/* Free the aborted object first. */
if (o) evas_object_del(o);
- o = e_app_icon_add(evas, a);
+ o = e_app_icon_add(a, evas);
bd->app = a;
e_object_ref(E_OBJECT(bd->app));
}
@@ -2613,7 +2613,7 @@
}
if (a)
{
- o = e_app_icon_add(evas, a);
+ o = e_app_icon_add(a, evas);
bd->app = a;
e_object_ref(E_OBJECT(bd->app));
}
@@ -4708,24 +4708,7 @@
bd->y + bd->fx.y + y,
drag_types, 1, bd, -1, NULL);
edje_object_file_get(bd->icon_object, &file, &part);
- if ((file) && (part))
- {
- o = edje_object_add(drag->evas);
- edje_object_file_set(o, file, part);
- }
- else
- {
- int iw, ih;
- void *data;
-
- data = e_icon_data_get(bd->icon_object, &iw,
&ih);
- if (data)
- {
- o = e_icon_add(drag->evas);
- e_icon_data_set(o, data, iw, ih);
- e_icon_alpha_set(o, 1);
- }
- }
+ o = e_border_icon_add(bd, drag->evas);
if (!o)
{
/* FIXME: fallback icon for drag */
@@ -4737,9 +4720,6 @@
e_drag_resize(drag, w, h);
e_drag_start(drag, bd->drag.x, bd->drag.y);
e_util_evas_fake_mouse_up_later(bd->bg_evas, 1);
-// evas_event_feed_mouse_up(bd->bg_evas, 1,
-// EVAS_BUTTON_NONE,
ev->time,
-// NULL);
}
bd->drag.start = 0;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- e_eap_editor.c 5 Nov 2006 03:31:45 -0000 1.71
+++ e_eap_editor.c 28 Dec 2006 13:43:30 -0000 1.72
@@ -586,5 +586,5 @@
cfdata->eap.icon_type = E_APP_ICON_PATH;
else
cfdata->eap.icon_type = E_APP_ICON_UNKNOWN;
- cfdata->editor->img = e_app_icon_add(cfdata->editor->evas, &(cfdata->eap));
+ cfdata->editor->img = e_app_icon_add(&(cfdata->eap), cfdata->editor->evas);
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_exebuf.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- e_exebuf.c 2 Dec 2006 03:08:36 -0000 1.28
+++ e_exebuf.c 28 Dec 2006 13:43:30 -0000 1.29
@@ -411,7 +411,7 @@
if (!a) a = e_app_generic_find(cmd_buf);
if (a)
{
- o = e_app_icon_add(exebuf->evas, a);
+ o = e_app_icon_add(a, exebuf->evas);
icon_object = o;
edje_object_part_swallow(bg_object, "e.swallow.icons", o);
evas_object_show(o);
@@ -1019,7 +1019,7 @@
evas_object_show(o);
if (edje_object_part_exists(exe->bg_object, "e.swallow.icons"))
{
- o = e_app_icon_add(exebuf->evas, exe->app);
+ o = e_app_icon_add(exe->app, exebuf->evas);
exe->icon_object = o;
edje_object_part_swallow(exe->bg_object, "e.swallow.icons", o);
evas_object_show(o);
@@ -1067,7 +1067,7 @@
a = e_app_exe_find(exe->file);
if (a)
{
- o = e_app_icon_add(exebuf->evas, a);
+ o = e_app_icon_add(a, exebuf->evas);
exe->icon_object = o;
edje_object_part_swallow(exe->bg_object, "e.swallow.icons",
o);
evas_object_show(o);
@@ -1120,7 +1120,7 @@
a = e_app_exe_find(exe->file);
if (a)
{
- o = e_app_icon_add(exebuf->evas, a);
+ o = e_app_icon_add(a, exebuf->evas);
exe->icon_object = o;
edje_object_part_swallow(exe->bg_object, "e.swallow.icons",
o);
evas_object_show(o);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -3 -r1.118 -r1.119
--- e_fm.c 14 Dec 2006 15:55:35 -0000 1.118
+++ e_fm.c 28 Dec 2006 13:43:30 -0000 1.119
@@ -2058,7 +2058,7 @@
app = e_app_new(buf, 0);
if (app)
{
- oic = e_app_icon_add(evas_object_evas_get(o), app);
+ oic = e_app_icon_add(app, evas_object_evas_get(o));
e_object_unref(E_OBJECT(app));
}
}
@@ -2125,7 +2125,7 @@
app = e_app_new(buf, 0);
if (app)
{
- oic = e_app_icon_add(evas_object_evas_get(o), app);
+ oic = e_app_icon_add(app, evas_object_evas_get(o));
e_object_unref(E_OBJECT(app));
}
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fwin.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- e_fwin.c 14 Dec 2006 15:46:58 -0000 1.25
+++ e_fwin.c 28 Dec 2006 13:43:30 -0000 1.26
@@ -795,7 +795,7 @@
for (l = apps; l; l = l->next)
{
a = l->data;
- oi = e_app_icon_add(evas, a);
+ oi = e_app_icon_add(a, evas);
e_widget_ilist_append(o, oi, a->name,
_e_fwin_cb_ilist_change, fad,
ecore_file_get_file(a->path));
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_init.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- e_init.c 12 Nov 2006 02:16:16 -0000 1.41
+++ e_init.c 28 Dec 2006 13:43:30 -0000 1.42
@@ -231,7 +231,7 @@
evas_object_show(o);
}
- o = e_app_icon_add(_e_init_evas, app);
+ o = e_app_icon_add(app, _e_init_evas);
evas_object_resize(o, _e_init_icon_size, _e_init_icon_size);
e_box_pack_end(_e_init_icon_box, o);
e_box_pack_options_set(o,
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- e_int_border_menu.c 25 Nov 2006 20:40:27 -0000 1.53
+++ e_int_border_menu.c 28 Dec 2006 13:43:30 -0000 1.54
@@ -256,7 +256,7 @@
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Edit Icon"));
e_menu_item_callback_set(mi, _e_border_menu_cb_icon_edit, bd);
- e_app_icon_add_to_menu_item(mi, bd->app);
+ e_app_icon_add_to_menu_item(bd->app, mi);
}
else if (bd->client.icccm.class) /* icons with no class useless to
borders */
{
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_modules.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- e_int_config_modules.c 27 Nov 2006 16:22:59 -0000 1.45
+++ e_int_config_modules.c 28 Dec 2006 13:43:30 -0000 1.46
@@ -522,7 +522,7 @@
a = e_app_new(buf, 1);
if (a)
{
- oc = e_app_icon_add(cfdata->evas, a);
+ oc = e_app_icon_add(a, cfdata->evas);
e_widget_ilist_append(cfdata->gui.list, oc, a->name,
NULL, NULL, cm->name);
e_object_unref(E_OBJECT(a));
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -3 -r1.187 -r1.188
--- e_int_menus.c 3 Dec 2006 21:25:47 -0000 1.187
+++ e_int_menus.c 28 Dec 2006 13:43:30 -0000 1.188
@@ -556,7 +556,7 @@
else if (opt == 0x1) snprintf(label, sizeof(label), "%s",
a->comment);
else snprintf(label, sizeof(label), "%s", a->name);
e_menu_item_label_set(mi, label);
- e_app_icon_add_to_menu_item(mi, a);
+ e_app_icon_add_to_menu_item(a, mi);
if (a->exe)
{
e_menu_item_callback_set(mi, _e_int_menus_apps_run, a);
@@ -641,7 +641,7 @@
drag = e_drag_new(m->zone->container, x, y,
drag_types, 1, a, -1,
_e_int_menus_apps_drag_finished);
- o = e_app_icon_add(e_drag_evas_get(drag), a);
+ o = e_app_icon_add(a, e_drag_evas_get(drag));
e_drag_object_set(drag, o);
e_drag_resize(drag, w, h);
e_object_ref(E_OBJECT(a));
@@ -1101,7 +1101,7 @@
// e_object_breadcrumb_add(E_OBJECT(bd), "lost_clients_menu");
e_menu_item_callback_set(mi, _e_int_menus_lost_clients_item_cb, bd);
a = bd->app;
- if (a) e_app_icon_add_to_menu_item(mi, a);
+ if (a) e_app_icon_add_to_menu_item(a, mi);
}
e_object_free_attach_func_set(E_OBJECT(m),
_e_int_menus_lost_clients_free_hook);
e_object_data_set(E_OBJECT(m), borders);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_module.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- e_module.c 12 Oct 2006 14:27:52 -0000 1.70
+++ e_module.c 28 Dec 2006 13:43:30 -0000 1.71
@@ -382,7 +382,7 @@
app = e_app_new(eap, 0);
if (app)
{
- dia->icon_object = e_app_icon_add(e_win_evas_get(dia->win),
app);
+ dia->icon_object = e_app_icon_add(app,
e_win_evas_get(dia->win));
edje_extern_object_min_size_set(dia->icon_object, 64, 64);
edje_object_part_swallow(dia->bg_object, "e.swallow.icon",
dia->icon_object);
evas_object_show(dia->icon_object);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
