X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fsystray%2Fsystraybar.c;h=e5bb7a1260a716c4237e76195a4ad4d832fc5cdf;hb=30ea5428a1a0080d01247458e0b2a8fc63ef582b;hp=0b92bb002d42896aca56a7fad8958eb4b6c26cef;hpb=2fd9e91579d04f8eeadea8a1584b2d994626a8f1;p=chaz%2Ftint2

diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c
index 0b92bb0..e5bb7a1 100644
--- a/src/systray/systraybar.c
+++ b/src/systray/systraybar.c
@@ -97,14 +97,6 @@ void init_systray_panel(void *p)
 {
 	Panel *panel =(Panel*)p;
 
-	if (panel_horizontal) {
-		systray.area.posy = panel->area.bg->border.width + panel->area.paddingy;
-		systray.area.height = panel->area.height - (2 * systray.area.posy);
-	}
-	else {
-		systray.area.posx = panel->area.bg->border.width + panel->area.paddingy;
-		systray.area.width = panel->area.width - (2 * panel->area.bg->border.width) - (2 * panel->area.paddingy);
-	}
 	systray.area.parent = p;
 	systray.area.panel = p;
 	
@@ -115,9 +107,9 @@ void init_systray_panel(void *p)
 			count++;
 	}
 	if (count == 0)
-		systray.area.on_screen = 0;
+		hide(&systray.area);
 	else 
-		systray.area.on_screen = 1;
+		show(&systray.area);
 	refresh_systray = 0;
 }
 
@@ -434,7 +426,7 @@ gboolean add_icon(Window id)
 	traywin->damage = 0;
 
 	if (systray.area.on_screen == 0)
-		systray.area.on_screen = 1;
+		show(&systray.area);
 
 	if (systray.sort == 3)
 		systray.list_icons = g_slist_prepend(systray.list_icons, traywin);
@@ -442,7 +434,6 @@ gboolean add_icon(Window id)
 		systray.list_icons = g_slist_append(systray.list_icons, traywin);
 	else
 		systray.list_icons = g_slist_insert_sorted(systray.list_icons, traywin, compare_traywindows);
-	systray.area.resize = 1;
 	//printf("add_icon id %lx, %d\n", id, g_slist_length(systray.list_icons));
 
 	// watch for the icon trying to resize itself!
@@ -458,8 +449,8 @@ gboolean add_icon(Window id)
 	if (!traywin->hide && !panel->is_hidden)
 		XMapRaised(server.dsp, traywin->id);
 
-	// changed in systray force resize on panel
-	panel->area.resize = 1;
+	// changed in systray
+	systray.area.resize = 1;
 	panel_refresh = 1;
 	return TRUE;
 }
@@ -471,7 +462,6 @@ void remove_icon(TrayWindow *traywin)
 
 	// remove from our list
 	systray.list_icons = g_slist_remove(systray.list_icons, traywin);
-	systray.area.resize = 1;
 	//printf("remove_icon id %lx, %d\n", traywin->id);
 
 	XSelectInput(server.dsp, traywin->tray_id, NoEventMask);
@@ -498,13 +488,11 @@ void remove_icon(TrayWindow *traywin)
 		if (!((TrayWindow*)l->data)->hide)
 			count++;
 	}
-	if (count == 0) {
-		systray.area.on_screen = 0;
-		systray.area.width = 0;
-	}
-	// changed in systray force resize on panel
-	Panel *panel = systray.area.panel;
-	panel->area.resize = 1;
+	if (count == 0)
+		hide(&systray.area);
+		
+	// changed in systray
+	systray.area.resize = 1;
 	panel_refresh = 1;
 }