nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert some code and cleanup

Browse source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@344 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
thilor77 2010-01-13 07:54:50 +00:00
parent 24a05d5b96
commit 8b4eed1a40
1 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/systray/systraybar.c
View file

@ -133,13 +133,9 @@ void resize_systray(void *obj)
if (!count) systray.area.width = 0; if (!count) systray.area.width = 0;
else { else {
int height = sysbar->area.height - 2*sysbar->area.bg->border.width - 2*sysbar->area.paddingy; int height = sysbar->area.height - 2*sysbar->area.bg->border.width - 2*sysbar->area.paddingy;
icons_per_column = height / (icon_size+sysbar->area.paddingx); // here icons_per_column always higher than 0
if (icons_per_column) icons_per_column = (height+sysbar->area.paddingx) / (icon_size+sysbar->area.paddingx);
marging = height - (icons_per_column-1)*(icon_size+sysbar->area.paddingx) - icon_size; marging = height - (icons_per_column-1)*(icon_size+sysbar->area.paddingx) - icon_size;
else {
marging = height - icon_size;
icons_per_column = 1;
}
icons_per_row = count / icons_per_column + (count%icons_per_column != 0); icons_per_row = count / icons_per_column + (count%icons_per_column != 0);
systray.area.width = (2 * systray.area.bg->border.width) + (2 * systray.area.paddingxlr) + (icon_size * icons_per_row) + ((icons_per_row-1) * systray.area.paddingx); systray.area.width = (2 * systray.area.bg->border.width) + (2 * systray.area.paddingxlr) + (icon_size * icons_per_row) + ((icons_per_row-1) * systray.area.paddingx);
} }
@ -156,13 +152,9 @@ void resize_systray(void *obj)
if (!count) systray.area.height = 0; if (!count) systray.area.height = 0;
else { else {
int width = sysbar->area.width - 2*sysbar->area.bg->border.width - 2*sysbar->area.paddingy; int width = sysbar->area.width - 2*sysbar->area.bg->border.width - 2*sysbar->area.paddingy;
icons_per_row = width / (icon_size+sysbar->area.paddingx); // here icons_per_row always higher than 0
if (icons_per_row) icons_per_row = (width+sysbar->area.paddingx) / (icon_size+sysbar->area.paddingx);
marging = width - (icons_per_row-1)*(icon_size+sysbar->area.paddingx) - icon_size; marging = width - (icons_per_row-1)*(icon_size+sysbar->area.paddingx) - icon_size;
else {
marging = width - icon_size;
icons_per_row = 1;
}
icons_per_column = count / icons_per_row+ (count%icons_per_row != 0); icons_per_column = count / icons_per_row+ (count%icons_per_row != 0);
systray.area.height = (2 * systray.area.bg->border.width) + (2 * systray.area.paddingxlr) + (icon_size * icons_per_column) + ((icons_per_column-1) * systray.area.paddingx); systray.area.height = (2 * systray.area.bg->border.width) + (2 * systray.area.paddingxlr) + (icon_size * icons_per_column) + ((icons_per_column-1) * systray.area.paddingx);
} }
@ -177,12 +169,13 @@ void resize_systray(void *obj)
} }
int i, posx, posy; int i, posx, posy;
int start = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy +marging/2;
if (panel_horizontal) { if (panel_horizontal) {
posy = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy +marging/2; posy = start;
posx = systray.area.posx + systray.area.bg->border.width + systray.area.paddingxlr; posx = systray.area.posx + systray.area.bg->border.width + systray.area.paddingxlr;
} }
else { else {
posx = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy +marging/2; posx = start;
posy = systray.area.posy + systray.area.bg->border.width + systray.area.paddingxlr; posy = systray.area.posy + systray.area.bg->border.width + systray.area.paddingxlr;
} }
@ -198,7 +191,7 @@ void resize_systray(void *obj)
if (i % icons_per_column) if (i % icons_per_column)
posy += icon_size + sysbar->area.paddingx; posy += icon_size + sysbar->area.paddingx;
else { else {
posy = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy +marging/2; posy = start;
posx += (icon_size + systray.area.paddingx); posx += (icon_size + systray.area.paddingx);
} }
} }
@ -206,7 +199,7 @@ void resize_systray(void *obj)
if (i % icons_per_row) if (i % icons_per_row)
posx += icon_size + systray.area.paddingx; posx += icon_size + systray.area.paddingx;
else { else {
posx = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy +marging/2; posx = start;
posy += (icon_size + systray.area.paddingx); posy += (icon_size + systray.area.paddingx);
} }
} }