Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed resize_clock() and snapshot

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@405 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
thilor77
2010-03-27 16:51:12 +00:00
parent a26a3e4635
commit 8afbb566a2
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/clock/clock.c
View File

@@ -258,8 +258,6 @@ void resize_clock (void *obj)
new_width += (2*clock->area.paddingxlr) + (2*clock->area.bg->border.width); new_width += (2*clock->area.paddingxlr) + (2*clock->area.bg->border.width);
Panel *panel = ((Area*)obj)->panel; 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)) { if (new_width > clock->area.width || new_width < (clock->area.width-6)) {
// resize clock // resize clock
// we try to limit the number of resize // we try to limit the number of resize
@@ -274,6 +272,8 @@ void resize_clock (void *obj)
systray.area.resize = 1; systray.area.resize = 1;
panel_refresh = 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); g_object_unref (layout);
cairo_destroy (c); cairo_destroy (c);

5
src/config.c
View File

@@ -527,12 +527,13 @@ void add_entry (char *key, char *value)
} }
/* Systray */ /* 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_enabled = atoi(value);
// systray is latest option added. files without 'systray' are old. // systray is latest option added. files without 'systray' are old.
old_config_file = 0; 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) if (old_config_file)
systray_enabled = 1; systray_enabled = 1;
extract_values(value, &value1, &value2, &value3); extract_values(value, &value1, &value2, &value3);