Enlightenment CVS committal
Author : moom
Project : e_modules
Module : mixer
Dir : e_modules/mixer
Modified Files:
alsa_mixer.c e_mod_main.c
Log Message:
* Improve the slide effect of the popup window when the module is in a
shelf placed at the top of the screen
===================================================================
RCS file: /cvs/e/e_modules/mixer/alsa_mixer.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- alsa_mixer.c 12 Sep 2006 16:06:04 -0000 1.14
+++ alsa_mixer.c 12 Sep 2006 16:27:42 -0000 1.15
@@ -476,6 +476,7 @@
id = _alsa_get_mixer_id(name);
if (id == channel_id)
{
+ printf("MOOm: %d %d\n",
snd_mixer_selem_has_playback_switch(elem), alsa_get_volume(card_id,
channel_id));
if (snd_mixer_selem_has_playback_switch(elem))
{
snd_mixer_selem_get_playback_switch(elem, id, &mute);
===================================================================
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- e_mod_main.c 12 Sep 2006 15:51:59 -0000 1.33
+++ e_mod_main.c 12 Sep 2006 16:27:42 -0000 1.34
@@ -640,8 +640,7 @@
break;
}
- e_popup_move(win->window, win->x, win->y);
- e_popup_resize(win->window, win->w, 0);
+ e_popup_move_resize(win->window, win->x, win->y, win->w, 0);
e_popup_show(win->window);
win->start_time = ecore_time_get();
@@ -694,8 +693,16 @@
h = progress * win->h;
prev_h = win->window->h;
- if (win->to_top) e_popup_move(win->window, win->x, win->y - h);
- e_popup_resize(win->window, win->w, h);
+ if (win->to_top)
+ {
+ e_popup_move_resize(win->window, win->x, win->y - h, win->w, h);
+ evas_object_move(win->bg_obj, 0, 0);
+ }
+ else
+ {
+ e_popup_resize(win->window, win->w, h);
+ evas_object_move(win->bg_obj, 0, h - win->h);
+ }
if (h >= win->h)
{
@@ -721,8 +728,16 @@
h = (1.0 - progress) * (1.0 - progress) * win->h;
prev_h = win->window->h;
- e_popup_resize(win->window, win->w, h);
- if (win->to_top) e_popup_move(win->window, win->x, win->y - h);
+ if (win->to_top)
+ {
+ e_popup_move_resize(win->window, win->x, win->y - h, win->w, h);
+ evas_object_move(win->bg_obj, 0, 0);
+ }
+ else
+ {
+ e_popup_resize(win->window, win->w, h);
+ evas_object_move(win->bg_obj, 0, h - win->h);
+ }
if (h <= 0)
{
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
