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;
launcher_enabled = 0;
}
-void resize_launcher(void *obj)
+
+int resize_launcher(void *obj)
{
Launcher *launcher = obj;
- Panel *panel = launcher->area.panel;
GSList *l;
int count, icon_size;
int icons_per_column=1, icons_per_row=1, marging=0;
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;
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;
}
}
}
-
- // resize force the redraw
- launcher->area.redraw = 1;
+ return 1;
}
// %c -> Name
// %k -> path
if (entry->exec) {
- char *exec2 = malloc(strlen(entry->exec) + strlen(entry->name) + strlen(entry->icon) + 100);
+ char *exec2 = malloc(strlen(entry->exec) + (entry->name ? strlen(entry->name) : 1) + (entry->icon ? strlen(entry->icon) : 1) + 100);
char *p, *q;
// p will never point to an escaped char
for (p = entry->exec, q = exec2; *p; p++, q++) {
launcher->icon_themes = g_slist_append(launcher->icon_themes, theme);
GSList* item = theme->list_inherits;
+ int pos = 0;
while (item != NULL)
{
char *parent = item->data;
queued_item = g_slist_next(queued_item);
}
if (!duplicate) {
- queue = g_slist_append(queue, strdup(parent));
+ queue = g_slist_insert(queue, strdup(parent), pos);
+ pos++;
queued = g_slist_append(queued, strdup(parent));
}
item = g_slist_next(item);