Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c e_border.c e_editable.c e_fwin.c e_spectrum.c
e_widget_color_well.c e_widget_cslider.c e_zone.c
Log Message:
1. jose's premul patches for evas
2. fixes to patches to re-enable smooth scale again
3. fixes to make txtblock colors work
4. fixes to edje for premul + grad api changes
5. fixes to ecore to work in premul space
6. fixes to e17 for premul space
7. fixes to emotion for premul
8. rebuild of .edj files as premul requires themes to be rebuilt
9. removed unused fils from cvs (eap and old img files)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -3 -r1.207 -r1.208
--- e_apps.c 30 Sep 2006 09:09:18 -0000 1.207
+++ e_apps.c 30 Sep 2006 10:16:23 -0000 1.208
@@ -2171,7 +2171,7 @@
* and so u have a nasty dangling pointer to garbage memory
*/
if (_e_apps_all)
- _e_apps_all->subapps = evas_list_remove_list(_e_apps_all->subapps, a);
+ _e_apps_all->subapps = evas_list_remove(_e_apps_all->subapps, a);
/* END FIXME */
while (evas_list_find(_e_apps_start_pending, a))
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.547
retrieving revision 1.548
diff -u -3 -r1.547 -r1.548
--- e_border.c 23 Sep 2006 08:39:41 -0000 1.547
+++ e_border.c 30 Sep 2006 10:16:23 -0000 1.548
@@ -5753,6 +5753,22 @@
bd->placed = 1;
}
+ /* always remember internal windows - config */
+ if ((bd->internal) && (!bd->remember) && (1)) /* FIXME: config value */
+ {
+ E_Remember *rem;
+
+ rem = e_remember_new();
+ if (rem)
+ {
+ rem->match = E_REMEMBER_MATCH_NAME | E_REMEMBER_MATCH_CLASS |
E_REMEMBER_MATCH_ROLE | E_REMEMBER_MATCH_TYPE | E_REMEMBER_MATCH_TRANSIENT;
+ rem->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE |
E_REMEMBER_APPLY_BORDER;
+ bd->remember = rem;
+ e_remember_use(rem);
+ e_remember_update(rem, bd);
+ }
+ }
+
if (bd->internal_ecore_evas)
ecore_evas_managed_move(bd->internal_ecore_evas,
bd->x + bd->fx.x + bd->client_inset.l,
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_editable.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_editable.c 21 Sep 2006 19:53:38 -0000 1.15
+++ e_editable.c 30 Sep 2006 10:16:23 -0000 1.16
@@ -1144,7 +1144,7 @@
evas_object_smart_member_add(sd->clip_object, object);
sd->event_object = evas_object_rectangle_add(evas);
- evas_object_color_set(sd->event_object, 255, 255, 255, 0);
+ evas_object_color_set(sd->event_object, 0, 0, 0, 0);
evas_object_clip_set(sd->event_object, sd->clip_object);
evas_object_move(sd->event_object, ox, oy);
evas_object_smart_member_add(sd->event_object, object);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fwin.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_fwin.c 29 Sep 2006 06:49:35 -0000 1.1
+++ e_fwin.c 30 Sep 2006 10:16:23 -0000 1.2
@@ -35,7 +35,7 @@
e_fwin_new(E_Container *con, const char *dev, const char *path)
{
E_Fwin *fwin;
- char buf[4096];
+ char buf[4096], *file;
Evas_Object *o;
E_Fm2_Config fmc;
@@ -53,11 +53,10 @@
fwin->win->data = fwin;
/* fm issues: */
- /* FIXME: need a way of going to parent dir */
- /* FIXME: need to handle change-in-place and new window per dir */
- /* FIXME: drop on file on another dir doesnt do drop all */
- /* FIXME: on shift-click then drag - don't deselect */
- /* FIXME: drag multiple files doesnt work */
+ /* FIXME: need a way of going to parent dir (menu extn.) */
+ /* FIXME: bug: drop on file on another dir doesnt do drop all */
+ /* FIXME: bug: on shift-click then drag - don't deselect */
+ /* FIXME: bug: drag multiple files doesnt work */
/* FIXME: temporary - a white bg until we have a proper fm specific
* scrollframe etc.
@@ -71,7 +70,7 @@
fwin->fm_obj = o;
memset(&fmc, 0, sizeof(E_Fm2_Config));
fmc.view.mode = E_FM2_VIEW_MODE_LIST;
- fmc.view.open_dirs_in_place = 1;
+ fmc.view.open_dirs_in_place = 0;
fmc.view.selector = 0;
fmc.view.single_click = 0;
fmc.view.no_subdir_jump = 0;
@@ -109,13 +108,14 @@
e_widget_focus_set(fwin->scrollframe_obj, 1);
- if (dev)
- snprintf(buf, sizeof(buf), "_fwin::/%s/::/%s", dev, path);
- else
- snprintf(buf, sizeof(buf), "_fwin:/%s", path);
+ snprintf(buf, sizeof(buf), "_fwin::/%s", e_fm2_real_path_get(fwin->fm_obj));
e_win_name_class_set(fwin->win, "E", buf);
- /* FIXME: better title */
- e_win_title_set(fwin->win, path);
+ file = ecore_file_get_file(e_fm2_real_path_get(fwin->fm_obj));
+ if (file)
+ snprintf(buf, sizeof(buf), "%s", file);
+ else
+ snprintf(buf, sizeof(buf), "%s", e_fm2_real_path_get(fwin->fm_obj));
+ e_win_title_set(fwin->win, buf);
e_win_size_min_set(fwin->win, 24, 24);
e_win_resize(fwin->win, 280, 200);
e_win_show(fwin->win);
@@ -165,6 +165,24 @@
_e_fwin_selected(void *data, Evas_Object *obj, void *event_info)
{
E_Fwin *fwin;
+ Evas_List *selected;
+ E_Fm2_Icon_Info *ici;
+ char buf[4096];
+ const *rp;
fwin = data;
+ selected = e_fm2_selected_list_get(fwin->fm_obj);
+ if (!selected) return;
+ ici = selected->data;
+ if ((ici->link) && (ici->mount))
+ e_fwin_new(fwin->win->container, ici->link, "/");
+ else if (ici->link)
+ e_fwin_new(fwin->win->container, NULL, ici->link);
+ else
+ {
+ snprintf(buf, sizeof(buf), "%s/%s",
+ e_fm2_real_path_get(fwin->fm_obj), ici->file);
+ e_fwin_new(fwin->win->container, NULL, buf);
+ }
+ evas_list_free(selected);
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_spectrum.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_spectrum.c 21 Aug 2006 16:29:14 -0000 1.9
+++ e_spectrum.c 30 Sep 2006 10:16:23 -0000 1.10
@@ -301,7 +301,11 @@
vx = (float)j / sp->iw;
//_e_spectrum_2d_color_at(sp, j, i, &r, &g, &b);
_e_spectrum_color_calc(sp, vx, vy, vz, &r, &g, &b);
- data[(i * sp->iw) + j] = (sp->cv->a << 24) | (r << 16) | (g << 8) |
b;
+ data[(i * sp->iw) + j] =
+ (sp->cv->a << 24) |
+ (((r << 16) * sp->cv->a) / 255) |
+ (((g << 8 ) * sp->cv->a) / 255) |
+ (((b ) * sp->cv->a) / 255);
}
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_color_well.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_widget_color_well.c 23 Aug 2006 03:39:02 -0000 1.7
+++ e_widget_color_well.c 30 Sep 2006 10:16:23 -0000 1.8
@@ -26,7 +26,11 @@
{
if (!wd) return;
- evas_object_color_set(wd->o_rect, wd->color->r, wd->color->g, wd->color->b,
wd->color->a);
+ evas_object_color_set(wd->o_rect,
+ (wd->color->r * wd->color->a) / 255,
+ (wd->color->g * wd->color->a) / 255,
+ (wd->color->b * wd->color->a) / 255,
+ wd->color->a);
e_widget_change(wd->obj);
}
@@ -118,7 +122,11 @@
o = evas_object_rectangle_add(evas);
e_widget_sub_object_add(obj, o);
- evas_object_color_set(o, color->r, color->g, color->b, color->a);
+ evas_object_color_set(o,
+ (color->r * color->a) / 255,
+ (color->g * color->a) / 255,
+ (color->b * color->a) / 255,
+ color->a);
edje_object_part_swallow(wd->o_edje, "e.swallow.content", o);
evas_object_show(o);
wd->o_rect = o;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_cslider.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_widget_cslider.c 23 Aug 2006 03:39:02 -0000 1.7
+++ e_widget_cslider.c 30 Sep 2006 10:16:23 -0000 1.8
@@ -209,49 +209,49 @@
if (!wd->color) return;
- evas_object_gradient_colors_clear(wd->o_grad);
+ evas_object_gradient_clear(wd->o_grad);
switch(wd->mode)
{
case E_COLOR_COMPONENT_R:
- evas_object_gradient_color_add(wd->o_grad, 0, wd->color->g,
wd->color->b, 255, 1);
- evas_object_gradient_color_add(wd->o_grad, 255, wd->color->g,
wd->color->b, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, 0, wd->color->g,
wd->color->b, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, 255, wd->color->g,
wd->color->b, 255, 1);
vx = wd->color->r / 255.0;
break;
case E_COLOR_COMPONENT_G:
- evas_object_gradient_color_add(wd->o_grad, wd->color->r, 0,
wd->color->b, 255, 1);
- evas_object_gradient_color_add(wd->o_grad, wd->color->r, 255,
wd->color->b, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, wd->color->r, 0,
wd->color->b, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, wd->color->r, 255,
wd->color->b, 255, 1);
vx = wd->color->g / 255.0;
break;
case E_COLOR_COMPONENT_B:
- evas_object_gradient_color_add(wd->o_grad, wd->color->r, wd->color->g,
0, 255, 1);
- evas_object_gradient_color_add(wd->o_grad, wd->color->r, wd->color->g,
255, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, wd->color->r,
wd->color->g, 0, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, wd->color->r,
wd->color->g, 255, 255, 1);
vx = wd->color->b / 255.0;
break;
case E_COLOR_COMPONENT_H:
evas_color_hsv_to_rgb(0, wd->color->s, wd->color->v, &max, &min, NULL);
- evas_object_gradient_color_add(wd->o_grad, max, min, min, 255, 1);
- evas_object_gradient_color_add(wd->o_grad, max, max, min, 255, 1);
- evas_object_gradient_color_add(wd->o_grad, min, max, min, 255, 1);
- evas_object_gradient_color_add(wd->o_grad, min, max, max, 255, 1);
- evas_object_gradient_color_add(wd->o_grad, min, min, max, 255, 1);
- evas_object_gradient_color_add(wd->o_grad, max, min, max, 255, 1);
- evas_object_gradient_color_add(wd->o_grad, max, min, min, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, max, min, min, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, max, max, min, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, min, max, min, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, min, max, max, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, min, min, max, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, max, min, max, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, max, min, min, 255, 1);
vx = wd->color->h / 360.0;
break;
case E_COLOR_COMPONENT_S:
evas_color_hsv_to_rgb(wd->color->h, 0, wd->color->v, &r, &g, &b);
- evas_object_gradient_color_add(wd->o_grad, r, g, b, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, r, g, b, 255, 1);
evas_color_hsv_to_rgb(wd->color->h, 1, wd->color->v, &r, &g, &b);
- evas_object_gradient_color_add(wd->o_grad, r, g, b, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, r, g, b, 255, 1);
vx = wd->color->s;
break;
case E_COLOR_COMPONENT_V:
evas_color_hsv_to_rgb(wd->color->h, wd->color->s, 0, &r, &g, &b);
- evas_object_gradient_color_add(wd->o_grad, r, g, b, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, r, g, b, 255, 1);
evas_color_hsv_to_rgb(wd->color->h, wd->color->s, 1, &r, &g, &b);
- evas_object_gradient_color_add(wd->o_grad, r, g, b, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, r, g, b, 255, 1);
vx = wd->color->v;
break;
case E_COLOR_COMPONENT_MAX:
@@ -268,22 +268,22 @@
float vx;
if (!wd) return;
- evas_object_gradient_colors_clear(wd->o_grad);
+ evas_object_gradient_clear(wd->o_grad);
switch(wd->mode)
{
case E_COLOR_COMPONENT_R:
- evas_object_gradient_color_add(wd->o_grad, 255, 0, 0, 255, 1);
- evas_object_gradient_color_add(wd->o_grad, 0, 0, 0, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, 255, 0, 0, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, 0, 0, 0, 255, 1);
vx = wd->color->r / 255.0;
break;
case E_COLOR_COMPONENT_G:
- evas_object_gradient_color_add(wd->o_grad, 0, 255, 0, 255, 1);
- evas_object_gradient_color_add(wd->o_grad, 0, 0, 0, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, 0, 255, 0, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, 0, 0, 0, 255, 1);
vx = wd->color->g / 255.0;
break;
case E_COLOR_COMPONENT_B:
- evas_object_gradient_color_add(wd->o_grad, 0, 0, 255, 255, 1);
- evas_object_gradient_color_add(wd->o_grad, 0, 0, 0, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, 0, 0, 255, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, 0, 0, 0, 255, 1);
vx = wd->color->b / 255.0;
break;
case E_COLOR_COMPONENT_H:
@@ -300,23 +300,23 @@
min = 0;
max = 255;
- evas_object_gradient_color_add(wd->o_grad, max, min, min, 255, 1);
- evas_object_gradient_color_add(wd->o_grad, max, min, max, 255, 1);
- evas_object_gradient_color_add(wd->o_grad, min, min, max, 255, 1);
- evas_object_gradient_color_add(wd->o_grad, min, max, max, 255, 1);
- evas_object_gradient_color_add(wd->o_grad, min, max, min, 255, 1);
- evas_object_gradient_color_add(wd->o_grad, max, max, min, 255, 1);
- evas_object_gradient_color_add(wd->o_grad, max, min, min, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, max, min, min, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, max, min, max, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, min, min, max, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, min, max, max, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, min, max, min, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, max, max, min, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, max, min, min, 255, 1);
vx = wd->color->h / 360.0;
break;
case E_COLOR_COMPONENT_S:
- evas_object_gradient_color_add(wd->o_grad, 255, 255, 255, 255, 1);
- evas_object_gradient_color_add(wd->o_grad, 0, 0, 0, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, 255, 255, 255, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, 0, 0, 0, 255, 1);
vx = wd->color->s;
break;
case E_COLOR_COMPONENT_V:
- evas_object_gradient_color_add(wd->o_grad, 255, 255, 255, 255, 1);
- evas_object_gradient_color_add(wd->o_grad, 0, 0, 0, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, 255, 255, 255, 255, 1);
+ evas_object_gradient_color_stop_add(wd->o_grad, 0, 0, 0, 255, 1);
vx = wd->color->v;
break;
case E_COLOR_COMPONENT_MAX:
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_zone.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -3 -r1.102 -r1.103
--- e_zone.c 16 Sep 2006 11:51:05 -0000 1.102
+++ e_zone.c 30 Sep 2006 10:16:23 -0000 1.103
@@ -97,7 +97,7 @@
evas_object_clip_set(o, zone->bg_clip_object);
evas_object_move(o, x, y);
evas_object_resize(o, w, h);
- evas_object_color_set(o, 255, 255, 255, 0);
+ evas_object_color_set(o, 0, 0, 0, 0);
evas_object_repeat_events_set(o, 1);
evas_object_show(o);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_e_zone_cb_bg_mouse_down, zone);
-------------------------------------------------------------------------
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
