fixed resize_clock() and snapshot

diff --git a/src/clock/clock.c b/src/clock/clock.c
index b6eb254537f01d31b2f7e2ddb0f7779938963345..e29c138a687cf82825a38d24c2321ce669aebe83 100644 (file)
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -258,8 +258,6 @@ void resize_clock (void *obj)
        new_width += (2*clock->area.paddingxlr) + (2*clock->area.bg->border.width);
 
        Panel *panel = ((Area*)obj)->panel;
-       clock->area.posx = panel->area.width - clock->area.width - panel->area.paddingxlr - panel->area.bg->border.width;
-
        if (new_width > clock->area.width || new_width < (clock->area.width-6)) {
                // resize clock
                // we try to limit the number of resize
@@ -274,6 +272,8 @@ void resize_clock (void *obj)
                systray.area.resize = 1;
                panel_refresh = 1;
        }
+       clock->area.posx = panel->area.width - clock->area.width - panel->area.paddingxlr - panel->area.bg->border.width;
+
 
        g_object_unref (layout);
        cairo_destroy (c);

diff --git a/src/config.c b/src/config.c
index 150face8b7f172eac0b7536f94dc4c951419a445..9e74f1751d94bb9d9f0642c0a5089b517e6a2c99 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -527,12 +527,13 @@ void add_entry (char *key, char *value)
        }
 
        /* Systray */
-       else if (strcmp (key, "systray") == 0) {
+       // systray disabled in snapshot mode
+       else if (strcmp (key, "systray") == 0 && snapshot_path == 0) {
                systray_enabled = atoi(value);
                // systray is latest option added. files without 'systray' are old.
                old_config_file = 0;
        }
-       else if (strcmp (key, "systray_padding") == 0) {
+       else if (strcmp (key, "systray_padding") == 0 && snapshot_path == 0) {
                if (old_config_file)
                        systray_enabled = 1;
                extract_values(value, &value1, &value2, &value3);