Enlightenment CVS committal
Author : iamsthitha
Project : e_modules
Module : taskbar
Dir : e_modules/taskbar
Modified Files:
e_mod_main.c
Log Message:
-fix a tiny sticky windows bug.
===================================================================
RCS file: /cvs/e/e_modules/taskbar/e_mod_main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_mod_main.c 17 Jul 2006 23:28:04 -0000 1.9
+++ e_mod_main.c 18 Jul 2006 05:16:49 -0000 1.10
@@ -175,7 +175,6 @@
case E_GADCON_ORIENT_CORNER_BL:
case E_GADCON_ORIENT_CORNER_BR:
_taskbar_orient_set(inst->taskbar, 1);
- //e_gadcon_client_aspect_set(gcc,
evas_list_count(inst->taskbar->borders) * 16 * 3, 16);
w =evas_list_count(inst->taskbar->borders);
e_gadcon_client_aspect_set(gcc, w * inst->taskbar->bwmin,
inst->taskbar->bheight);
@@ -188,7 +187,9 @@
case E_GADCON_ORIENT_CORNER_LB:
case E_GADCON_ORIENT_CORNER_RB:
_taskbar_orient_set(inst->taskbar, 0);
- e_gadcon_client_aspect_set(gcc, 16,
evas_list_count(inst->taskbar->borders) * 16 * 3);
+ w =evas_list_count(inst->taskbar->borders);
+
+ e_gadcon_client_aspect_set(gcc, inst->taskbar->bwmin, w *
inst->taskbar->bhmin);
break;
default:
break;
@@ -335,7 +336,7 @@
continue;
if (bd->client.netwm.state.skip_taskbar)
continue;
- if (((bd->desk == e_desk_current_get(b->zone)) && (bd->zone ==
b->zone)) || (bd->sticky) || (ci->show_all))
+ if ((((bd->desk == e_desk_current_get(b->zone))||(bd->sticky)) &&
(bd->zone == b->zone)) || (ci->show_all))
{
b->borders = evas_list_append(b->borders, bd);
ic = _taskbar_icon_new(b, bd);
@@ -545,11 +546,11 @@
return 1;
if (_taskbar_icon_find(b, bd))
return 1;
- if (!(bd->sticky || ci->show_all))
+ if (!(ci->show_all))
{
if (bd->zone != b->zone)
return 1;
- if (bd->desk != e_desk_current_get(bd->zone))
+ if ((bd->desk != e_desk_current_get(bd->zone))||bd->sticky)
return 1;
}
-------------------------------------------------------------------------
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
