Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mixer
Dir : e_modules/mixer
Modified Files:
e_mod_main.c
Log Message:
Fix popup window location for shelf positions.
===================================================================
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- e_mod_main.c 22 Sep 2006 10:08:00 -0000 1.46
+++ e_mod_main.c 3 Oct 2006 02:18:04 -0000 1.47
@@ -761,24 +761,32 @@
switch (inst->gcc->gadcon->orient)
{
- case E_GADCON_ORIENT_LEFT:
- case E_GADCON_ORIENT_CORNER_LT:
- case E_GADCON_ORIENT_CORNER_LB:
- win->x += cw;
- if (win->to_top) win->y += oh;
- break;
- case E_GADCON_ORIENT_RIGHT:
- case E_GADCON_ORIENT_CORNER_RT:
- case E_GADCON_ORIENT_CORNER_RB:
- win->x -= win->w;
- if (win->to_top) win->y += oh;
- break;
- default:
- win->x += (ow - win->w) / 2;
- if (win->x < cx) win->x = cx;
- if ((win->x + win->w) > (cx + cw)) win->x = cx + cw - win->w;
- if (!win->to_top) win->y += ch;
- break;
+ case E_GADCON_ORIENT_LEFT:
+ case E_GADCON_ORIENT_CORNER_LT:
+ case E_GADCON_ORIENT_CORNER_LB:
+ win->x += ox + ow;
+ if (win->to_top) win->y += oh;
+ break;
+ case E_GADCON_ORIENT_RIGHT:
+ case E_GADCON_ORIENT_CORNER_RT:
+ case E_GADCON_ORIENT_CORNER_RB:
+ win->x -= (win->w - ((cx + cw) - (ox + ow)) + 5);
+ if (win->to_top) win->y += oh;
+ break;
+ case E_GADCON_ORIENT_TOP:
+ case E_GADCON_ORIENT_CORNER_TL:
+ case E_GADCON_ORIENT_CORNER_TR:
+ win->x += ((ow - win->w) / 2);
+ if (win->x < cx) win->x = cx;
+ if ((win->x + win->w) > (cx + cw)) win->x = cx + cw - win->w;
+ if (!win->to_top) win->y += oh;
+ break;
+ default:
+ win->x += ((ow - win->w) / 2);
+ if (win->x < cx) win->x = cx;
+ if ((win->x + win->w) > (cx + cw)) win->x = cx + cw - win->w;
+ if (!win->to_top) win->y += (cy + ch);
+ break;
}
e_popup_move_resize(win->window, win->x, win->y, win->w, 0);
-------------------------------------------------------------------------
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
