X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Flauncher%2Flauncher.c;h=630a74ecf0402136136ee977763f94086aadf37d;hb=bbec33ce1a15b555a737f2fefe7bdfb6a8881705;hp=50d3829100636e665a6bcf1e833ab4dd4f9e8841;hpb=7a03bbf353324d6803aa84ca8fd41e6c6f4d099c;p=chaz%2Ftint2

diff --git a/src/launcher/launcher.c b/src/launcher/launcher.c
index 50d3829..630a74e 100644
--- a/src/launcher/launcher.c
+++ b/src/launcher/launcher.c
@@ -70,18 +70,13 @@ void init_launcher_panel(void *p)
 	launcher->area._resize = resize_launcher;
 	launcher->area.resize = 1;
 	launcher->area.redraw = 1;
-	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->area.height = panel->area.height - (2 * launcher->area.posy);
-	}
-	else {
-		// panel vertical => fixed width, height, posy and posx
-		launcher->area.posx = panel->area.bg->border.width + panel->area.paddingxlr;
-		launcher->area.width = panel->area.width - (2 * panel->area.bg->border.width) - (2 * panel->area.paddingy);
-	}
+	// check consistency
+	if (launcher->list_apps == NULL)
+		return;
+
+	launcher->area.on_screen = 1;
+	panel_refresh = 1;
 
 	fprintf(stderr, "Loading themes...\n");
 	launcher_load_themes(launcher);
@@ -149,10 +144,10 @@ void cleanup_launcher()
 	launcher_enabled = 0;
 }
 
+
 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;
@@ -222,9 +217,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 +228,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;