X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fsystray%2Fsystraybar.c;h=c0672e35b7335d1fde481e71f8f2326729215580;hb=87acd48b92031b378887ea8b7ea9fa54aea8fa25;hp=23d2ab3821d1b58883ed1a0a380dd36a1bea2626;hpb=c75069e03de761de15a6d74a4df0d7dbe6672b6e;p=chaz%2Ftint2

diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c
index 23d2ab3..c0672e3 100644
--- a/src/systray/systraybar.c
+++ b/src/systray/systraybar.c
@@ -1,7 +1,7 @@
 /**************************************************************************
 * Tint2 : systraybar
 *
-* Copyright (C) 2009 thierry lorthiois (lorthiois@bbsoft.fr)
+* Copyright (C) 2009 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution
 * based on 'docker-1.5' from Ben Jansens.
 *
 * This program is free software; you can redistribute it and/or
@@ -98,7 +98,9 @@ void init_systray_panel(void *p)
 {
 	systray.area.parent = p;
 	systray.area.panel = p;
-	
+	if (systray.area.bg == 0)
+		systray.area.bg = &g_array_index(backgrounds, Background, 0);
+
 	GSList *l;
 	int count = 0;
 	for (l = systray.list_icons; l ; l = l->next) {
@@ -167,11 +169,11 @@ int resize_systray(void *obj)
 
 void on_change_systray (void *obj)
 {
-	// here, sysbar's position is defined. so we can calculate position of tray icon.
+	// here, systray.area.posx/posy are defined by rendering engine. so we can calculate position of tray icon.
 	Systraybar *sysbar = obj;
 	Panel *panel = sysbar->area.panel;
 	int i, posx, posy;
-	int start = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy +sysbar->marging/2;
+	int start = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy + sysbar->marging/2;
 	if (panel_horizontal) {
 		posy = start;
 		posx = systray.area.posx + systray.area.bg->border.width + systray.area.paddingxlr;
@@ -189,6 +191,7 @@ void on_change_systray (void *obj)
 
 		traywin->y = posy;
 		traywin->x = posx;
+		//printf("systray %d : %d,%d\n", i, posx, posy);
 		traywin->width = sysbar->icon_size;
 		traywin->height = sysbar->icon_size;
 		if (panel_horizontal) {
@@ -532,6 +535,11 @@ void systray_render_icon_now(void* t)
 	// we made also sure, that we always have a 32 bit visual, i.e. we can safely create 32 bit pixmaps here
 	TrayWindow* traywin = t;
 	traywin->render_timeout = 0;
+	if ( traywin->width == 0 || traywin->height == 0 ) {
+		// reschedule rendering since the geometry information has not yet been processed (can happen on slow cpu)
+		systray_render_icon(traywin);
+		return;
+	}
 
 	// good systray icons support 32 bit depth, but some icons are still 24 bit.
 	// We create a heuristic mask for these icons, i.e. we get the rgb value in the top left corner, and