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

panel_items : fixed tray icon position.

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@553 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
thilor77
2010-09-18 22:00:16 +00:00
parent ffe45bd7da
commit 1bd5fd9937
3 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/panel.c
View File

@@ -461,7 +461,7 @@ void set_panel_items(Panel *p)
g_slist_free(p->area.list); g_slist_free(p->area.list);
p->area.list = 0; p->area.list = 0;
} }
printf("panel_items_order %s\n", panel_items_order);
for (k=0 ; k < strlen(panel_items_order) ; k++) { for (k=0 ; k < strlen(panel_items_order) ; k++) {
if (panel_items_order[k] == 'L') { if (panel_items_order[k] == 'L') {
init_launcher_panel(p); init_launcher_panel(p);

56
src/systray/systraybar.c
View File

@@ -124,12 +124,11 @@ void init_systray_panel(void *p)
void draw_systray(void *obj, cairo_t *c) void draw_systray(void *obj, cairo_t *c)
{ {
// TODO : position and size the icon window when position of systray is known // here, sysbar's position is defined. so we can calculate position of tray icon.
Systraybar *sysbar = obj; Systraybar *sysbar = obj;
Panel *panel = sysbar->area.panel; Panel *panel = sysbar->area.panel;
int i, posx, posy, marging=3, icons_per_column=1, icons_per_row=1; int i, posx, posy;
int icon_size = 24; int start = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy +sysbar->marging/2;
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 = start; 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;
@@ -147,28 +146,28 @@ void draw_systray(void *obj, cairo_t *c)
traywin->y = posy; traywin->y = posy;
traywin->x = posx; traywin->x = posx;
traywin->width = icon_size; traywin->width = sysbar->icon_size;
traywin->height = icon_size; traywin->height = sysbar->icon_size;
if (panel_horizontal) { if (panel_horizontal) {
if (i % icons_per_column) if (i % sysbar->icons_per_column)
posy += icon_size + sysbar->area.paddingx; posy += sysbar->icon_size + sysbar->area.paddingx;
else { else {
posy = start; posy = start;
posx += (icon_size + systray.area.paddingx); posx += (sysbar->icon_size + systray.area.paddingx);
} }
} }
else { else {
if (i % icons_per_row) if (i % sysbar->icons_per_row)
posx += icon_size + systray.area.paddingx; posx += sysbar->icon_size + systray.area.paddingx;
else { else {
posx = start; posx = start;
posy += (icon_size + systray.area.paddingx); posy += (sysbar->icon_size + systray.area.paddingx);
} }
} }
// position and size the icon window // position and size the icon window
XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, icon_size, icon_size); XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, sysbar->icon_size, sysbar->icon_size);
XResizeWindow(server.dsp, traywin->tray_id, icon_size, icon_size); XResizeWindow(server.dsp, traywin->tray_id, sysbar->icon_size, sysbar->icon_size);
} }
if (server.real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) { if (server.real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
@@ -185,16 +184,15 @@ int resize_systray(void *obj)
{ {
Systraybar *sysbar = obj; Systraybar *sysbar = obj;
GSList *l; GSList *l;
int count, icon_size; int count;
int icons_per_column=1, icons_per_row=1, marging=0;
if (panel_horizontal) if (panel_horizontal)
icon_size = sysbar->area.height; sysbar->icon_size = sysbar->area.height;
else else
icon_size = sysbar->area.width; sysbar->icon_size = sysbar->area.width;
icon_size = icon_size - (2 * sysbar->area.bg->border.width) - (2 * sysbar->area.paddingy); sysbar->icon_size = sysbar->icon_size - (2 * sysbar->area.bg->border.width) - (2 * sysbar->area.paddingy);
if (systray_max_icon_size > 0 && icon_size > systray_max_icon_size) if (systray_max_icon_size > 0 && sysbar->icon_size > systray_max_icon_size)
icon_size = systray_max_icon_size; sysbar->icon_size = systray_max_icon_size;
count = 0; count = 0;
for (l = systray.list_icons; l ; l = l->next) { for (l = systray.list_icons; l ; l = l->next) {
if (!((TrayWindow*)l->data)->hide) if (!((TrayWindow*)l->data)->hide)
@@ -205,18 +203,18 @@ int resize_systray(void *obj)
if (panel_horizontal) { if (panel_horizontal) {
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;
// here icons_per_column always higher than 0 // here icons_per_column always higher than 0
icons_per_column = (height+sysbar->area.paddingx) / (icon_size+sysbar->area.paddingx); sysbar->icons_per_column = (height+sysbar->area.paddingx) / (sysbar->icon_size+sysbar->area.paddingx);
marging = height - (icons_per_column-1)*(icon_size+sysbar->area.paddingx) - icon_size; sysbar->marging = height - (sysbar->icons_per_column-1)*(sysbar->icon_size+sysbar->area.paddingx) - sysbar->icon_size;
icons_per_row = count / icons_per_column + (count%icons_per_column != 0); sysbar->icons_per_row = count / sysbar->icons_per_column + (count%sysbar->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) + (sysbar->icon_size * sysbar->icons_per_row) + ((sysbar->icons_per_row-1) * systray.area.paddingx);
} }
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;
// here icons_per_row always higher than 0 // here icons_per_row always higher than 0
icons_per_row = (width+sysbar->area.paddingx) / (icon_size+sysbar->area.paddingx); sysbar->icons_per_row = (width+sysbar->area.paddingx) / (sysbar->icon_size+sysbar->area.paddingx);
marging = width - (icons_per_row-1)*(icon_size+sysbar->area.paddingx) - icon_size; sysbar->marging = width - (sysbar->icons_per_row-1)*(sysbar->icon_size+sysbar->area.paddingx) - sysbar->icon_size;
icons_per_column = count / icons_per_row+ (count%icons_per_row != 0); sysbar->icons_per_column = count / sysbar->icons_per_row+ (count%sysbar->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) + (sysbar->icon_size * sysbar->icons_per_column) + ((sysbar->icons_per_column-1) * systray.area.paddingx);
} }
return 1; return 1;
} }

1
src/systray/systraybar.h
View File

@@ -28,6 +28,7 @@ typedef struct {
GSList *list_icons; GSList *list_icons;
int sort; int sort;
int alpha, saturation, brightness; int alpha, saturation, brightness;
int icon_size, icons_per_column, icons_per_row, marging;
} Systraybar; } Systraybar;