launcher : fixed icon position

[chaz/tint2] / src / systray / systraybar.c

diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c
index 23d2ab3821d1b58883ed1a0a380dd36a1bea2626..c2f437e679d067d3eed61e0684dd720e9da4c30e 100644 (file)
--- 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
@@ -167,11 +167,10 @@ 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 = systray.area.posy + 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 +188,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 +532,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