*fix* issue 282

[chaz/tint2] / src / tint.c

diff --git a/src/tint.c b/src/tint.c
index 67cb81ca20ddbd5eea0bee9f9c461b6391ad4eb1..0352aa891d9064545a087347c94635943eab7aee 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -158,13 +158,13 @@ void cleanup()
 {
        cleanup_timeout();
        cleanup_systray();
-       cleanup_panel();
        cleanup_tooltip();
        cleanup_clock();
        cleanup_launcher();
 #ifdef ENABLE_BATTERY
        cleanup_battery();
 #endif
+       cleanup_panel();
        cleanup_config();
 
        if (default_icon) {
@@ -186,6 +186,8 @@ void get_snapshot(const char *path)
                panel->area.width = server.monitor[0].width;
 
        panel->temp_pmap = XCreatePixmap(server.dsp, server.root_win, panel->area.width, panel->area.height, server.depth);
+       size_by_content(&panel->area);
+       size_by_layout(&panel->area);
        refresh(&panel->area);
 
        Imlib_Image img = NULL;
@@ -775,6 +777,8 @@ start:
                                else {
                                        if (panel->temp_pmap) XFreePixmap(server.dsp, panel->temp_pmap);
                                        panel->temp_pmap = XCreatePixmap(server.dsp, server.root_win, panel->area.width, panel->area.height, server.depth);
+                                       size_by_content(&panel->area);
+                                       size_by_layout(&panel->area);
                                        refresh(&panel->area);
                                        XCopyArea(server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
                                }
@@ -845,7 +849,7 @@ start:
                                                Panel* panel = get_panel(e.xmotion.window);
                                                Area* area = click_area(panel, e.xmotion.x, e.xmotion.y);
                                                if (area->_get_tooltip_text)
-                                                       tooltip_trigger_show(area, panel, e.xmotion.x_root, e.xmotion.y_root);
+                                                       tooltip_trigger_show(area, panel, &e);
                                                else
                                                        tooltip_trigger_hide();
                                                break;