Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

center tray icon when systray_icon_size specified

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@343 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
thilor77
2010-01-13 00:33:23 +00:00
parent 08a8c4b823
commit 24a05d5b96
1 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/systray/systraybar.c
View File

@@ -112,8 +112,8 @@ void resize_systray(void *obj)
Panel *panel = sysbar->area.panel; Panel *panel = sysbar->area.panel;
TrayWindow *traywin; TrayWindow *traywin;
GSList *l; GSList *l;
int count, posx, posy; int count, icon_size;
int icon_size; int icons_per_column, icons_per_row, marging;
if (panel_horizontal) if (panel_horizontal)
icon_size = sysbar->area.height; icon_size = sysbar->area.height;
@@ -132,9 +132,16 @@ void resize_systray(void *obj)
if (panel_horizontal) { if (panel_horizontal) {
if (!count) systray.area.width = 0; if (!count) systray.area.width = 0;
else { else {
int icons_per_column = (sysbar->area.height - 2*sysbar->area.bg->border.width - 2*sysbar->area.paddingy + sysbar->area.paddingx) / (icon_size+sysbar->area.paddingx); int height = sysbar->area.height - 2*sysbar->area.bg->border.width - 2*sysbar->area.paddingy;
int row_count = count / icons_per_column + (count%icons_per_column != 0); icons_per_column = height / (icon_size+sysbar->area.paddingx);
systray.area.width = (2 * systray.area.bg->border.width) + (2 * systray.area.paddingxlr) + (icon_size * row_count) + ((row_count-1) * systray.area.paddingx); if (icons_per_column)
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);
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.posx = panel->area.width - panel->area.bg->border.width - panel->area.paddingxlr - systray.area.width; systray.area.posx = panel->area.width - panel->area.bg->border.width - panel->area.paddingxlr - systray.area.width;
@@ -148,9 +155,16 @@ void resize_systray(void *obj)
else { else {
if (!count) systray.area.height = 0; if (!count) systray.area.height = 0;
else { else {
int icons_per_row = (sysbar->area.width - 2*sysbar->area.bg->border.width - 2*sysbar->area.paddingy + sysbar->area.paddingx) / (icon_size+sysbar->area.paddingx); int width = sysbar->area.width - 2*sysbar->area.bg->border.width - 2*sysbar->area.paddingy;
int column_count = count / icons_per_row+ (count%icons_per_row != 0); icons_per_row = width / (icon_size+sysbar->area.paddingx);
systray.area.height = (2 * systray.area.bg->border.width) + (2 * systray.area.paddingxlr) + (icon_size * column_count) + ((column_count-1) * systray.area.paddingx); if (icons_per_row)
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);
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.posy = panel->area.bg->border.width + panel->area.paddingxlr; systray.area.posy = panel->area.bg->border.width + panel->area.paddingxlr;
@@ -162,19 +176,17 @@ void resize_systray(void *obj)
#endif #endif
} }
int max_line_pos; int i, posx, posy;
if (panel_horizontal) { if (panel_horizontal) {
max_line_pos = sysbar->area.posy+sysbar->area.height - sysbar->area.bg->border.width - sysbar->area.paddingy - icon_size; posy = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy +marging/2;
posy = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy;
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 {
max_line_pos = sysbar->area.posx+sysbar->area.width - sysbar->area.bg->border.width - sysbar->area.paddingy - icon_size; posx = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy +marging/2;
posx = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy;
posy = systray.area.posy + systray.area.bg->border.width + systray.area.paddingxlr; posy = systray.area.posy + systray.area.bg->border.width + systray.area.paddingxlr;
} }
for (l = systray.list_icons; l ; l = l->next) { for (i=1, l = systray.list_icons; l ; i++, l = l->next) {
traywin = (TrayWindow*)l->data; traywin = (TrayWindow*)l->data;
if (traywin->hide) continue; if (traywin->hide) continue;
@@ -183,19 +195,19 @@ void resize_systray(void *obj)
traywin->width = icon_size; traywin->width = icon_size;
traywin->height = icon_size; traywin->height = icon_size;
if (panel_horizontal) { if (panel_horizontal) {
if (posy + icon_size + sysbar->area.paddingxlr < max_line_pos) 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;
posx += (icon_size + systray.area.paddingx); posx += (icon_size + systray.area.paddingx);
posy = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy;
} }
} }
else { else {
if (posx + icon_size + sysbar->area.paddingxlr < max_line_pos) 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;
posy += (icon_size + systray.area.paddingx); posy += (icon_size + systray.area.paddingx);
posx = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy;
} }
} }