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

panel_items : fixed some segfault.

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@549 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
thilor77
2010-09-18 14:58:00 +00:00
parent 3791486704
commit 500981b052
4 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/launcher/launcher.c
View File

@@ -70,8 +70,12 @@ void init_launcher_panel(void *p)
launcher->area._resize = resize_launcher;
launcher->area.resize = 1;
launcher->area.redraw = 1;
launcher->area.on_screen = 1;
// check consistency
if (launcher->list_apps == NULL)
return;
launcher->area.on_screen = 1;
if (panel_horizontal) {
// panel horizonal => fixed height and posy
launcher->area.posy = panel->area.bg->border.width + panel->area.paddingy;
@@ -149,6 +153,7 @@ void cleanup_launcher()
launcher_enabled = 0;
}
int resize_launcher(void *obj)
{
Launcher *launcher = obj;
@@ -222,9 +227,6 @@ int resize_launcher(void *obj)
icons_per_row = count / icons_per_column + (count%icons_per_column != 0);
launcher->area.width = (2 * launcher->area.bg->border.width) + (2 * launcher->area.paddingxlr) + (icon_size * icons_per_row) + ((icons_per_row-1) * launcher->area.paddingx);
}
// launcher->area.posx = panel->area.bg->border.width + panel->area.paddingxlr;
launcher->area.posy = panel->area.bg->border.width;
}
else {
if (!count) launcher->area.height = 0;
@@ -236,9 +238,6 @@ int resize_launcher(void *obj)
icons_per_column = count / icons_per_row+ (count%icons_per_row != 0);
launcher->area.height = (2 * launcher->area.bg->border.width) + (2 * launcher->area.paddingxlr) + (icon_size * icons_per_column) + ((icons_per_column-1) * launcher->area.paddingx);
}
launcher->area.posx = panel->area.bg->border.width;
// launcher->area.posy = panel->area.height - panel->area.bg->border.width - panel->area.paddingxlr - launcher->area.height;
}
int i, posx, posy;