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

cleanup

Browse source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@81 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
lorthiois@bbsoft.fr 2009-05-31 20:36:16 +00:00
parent a081c0a57d
commit 2c80522212
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,3 +1,6 @@
2009-05-31
- fixed issue 86 : padding bug
2009-05-31 2009-05-31
- fixed issue 87 and 88 : battery detection - fixed issue 87 and 88 : battery detection

35
src/panel.c
View file

@ -174,11 +174,6 @@ void resize_panel(void *obj)
Panel *panel = (Panel*)obj; Panel *panel = (Panel*)obj;
int taskbar_width, modulo_width, taskbar_on_screen; int taskbar_width, modulo_width, taskbar_on_screen;
//printf("resize_panel : : posx et width des barres de taches\n");
if (panel_mode == MULTI_DESKTOP) taskbar_on_screen = panel->nb_desktop;
else taskbar_on_screen = 1;
taskbar_width = panel->area.width - (2 * panel->area.paddingxlr) - (2 * panel->area.pix.border.width); taskbar_width = panel->area.width - (2 * panel->area.paddingxlr) - (2 * panel->area.pix.border.width);
if (panel->clock.area.on_screen && panel->clock.area.width) if (panel->clock.area.on_screen && panel->clock.area.width)
taskbar_width -= (panel->clock.area.width + panel->area.paddingx); taskbar_width -= (panel->clock.area.width + panel->area.paddingx);
@ -188,29 +183,31 @@ void resize_panel(void *obj)
if (systray.area.on_screen && systray.area.width && panel == &panel1[0]) if (systray.area.on_screen && systray.area.width && panel == &panel1[0])
taskbar_width -= (systray.area.width + panel->area.paddingx); taskbar_width -= (systray.area.width + panel->area.paddingx);
taskbar_width = (taskbar_width - ((taskbar_on_screen-1) * panel->area.paddingx)) / taskbar_on_screen; if (panel_mode == MULTI_DESKTOP) {
taskbar_on_screen = panel->nb_desktop;
if (taskbar_on_screen > 1) int width = taskbar_width - ((taskbar_on_screen-1) * panel->area.paddingx);
modulo_width = (taskbar_width - ((taskbar_on_screen-1) * panel->area.paddingx)) % taskbar_on_screen; taskbar_width = width / taskbar_on_screen;
else modulo_width = width % taskbar_on_screen;
}
else {
taskbar_on_screen = 1;
modulo_width = 0; modulo_width = 0;
}
// change posx and width for all taskbar // change posx and width for all taskbar
int i, modulo=0, posx=0; int i, posx;
posx = panel->area.pix.border.width + panel->area.paddingxlr;
for (i=0 ; i < panel->nb_desktop ; i++) { for (i=0 ; i < panel->nb_desktop ; i++) {
if ((i % taskbar_on_screen) == 0) {
posx = panel->area.pix.border.width + panel->area.paddingxlr;
modulo = modulo_width;
}
else posx += taskbar_width + panel->area.paddingx;
panel->taskbar[i].area.posx = posx; panel->taskbar[i].area.posx = posx;
panel->taskbar[i].area.width = taskbar_width; panel->taskbar[i].area.width = taskbar_width;
panel->taskbar[i].area.resize = 1; panel->taskbar[i].area.resize = 1;
if (modulo) { if (modulo_width) {
panel->taskbar[i].area.width++; panel->taskbar[i].area.width++;
modulo--; modulo_width--;
} }
//printf("taskbar %d : posx %d, width, %d, posy %d\n", i, posx, panel->taskbar[i].area.width, posx + panel->taskbar[i].area.width);
if (panel_mode == MULTI_DESKTOP)
posx += panel->taskbar[i].area.width + panel->area.paddingx;
} }
} }

BIN
src/tint2
View file

Binary file not shown.