? data/sunset.jpg
Index: plugins/plugin.h
===================================================================
RCS file: /cvsroot/further/further/plugins/plugin.h,v
retrieving revision 1.16
diff -u -r1.16 plugin.h
--- plugins/plugin.h	2002/01/23 00:38:32	1.16
+++ plugins/plugin.h	2002/01/25 19:38:52
@@ -9,7 +9,7 @@
 
 #include <Evas.h>
 
-#define PIXMAP_SIZE 48
+#define PIXMAP_SIZE 36
 
 extern Evas evas;
 extern Display *dpy;
Index: plugins/battery/battery.c
===================================================================
RCS file: /cvsroot/further/further/plugins/battery/battery.c,v
retrieving revision 1.1
diff -u -r1.1 battery.c
--- plugins/battery/battery.c	2002/01/22 05:58:31	1.1
+++ plugins/battery/battery.c	2002/01/25 19:38:53
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
-#define BAR_Y 400
+#define BAR_Y 726
 
 static char *plugin_name = "Battery";
 static Plugin *plugin;
Index: plugins/clock/clock.c
===================================================================
RCS file: /cvsroot/further/further/plugins/clock/clock.c,v
retrieving revision 1.16
diff -u -r1.16 clock.c
--- plugins/clock/clock.c	2002/01/22 05:58:31	1.16
+++ plugins/clock/clock.c	2002/01/25 19:38:53
@@ -67,8 +67,8 @@
 	evas_move(evas, edate, 
 			plugin->x != -1 
 				? plugin->x
-				: dpy_width - text_width,
-				plugin->y+text_height);
+				: dpy_width - text_width - 50,
+				plugin->y);
 	evas_show(evas, edate);
 }
 
Index: plugins/launcher/launcher.c
===================================================================
RCS file: /cvsroot/further/further/plugins/launcher/launcher.c,v
retrieving revision 1.13
diff -u -r1.13 launcher.c
--- plugins/launcher/launcher.c	2001/11/02 01:33:06	1.13
+++ plugins/launcher/launcher.c	2002/01/25 19:38:54
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#define PIXMAP_SIZE 48
+int pixmap_size;
 
 static char *plugin_name = "Launcher";
 static Plugin *plugin;
@@ -37,21 +37,22 @@
 static void 
 mouse_down(void *data, Evas e, Evas_Object o, int b, int x, int y) {
 	evas_set_color(evas, o, 255, 255, 255, 255);
-	zoom(o, 44, 44);
+	zoom(o, pixmap_size*0.8, pixmap_size*0.8);
 }
 
 static void
 mouse_up(void *data, Evas e, Evas_Object o, int b, int x, int y) {
 	if (b == 1)
 		furtherp_fork_exec(data);
-	zoom(o, 48, 48);
+	zoom(o, pixmap_size, pixmap_size);
 }
 
 Evas_Object add_icon(char *command, char *imagepath, int x, int y) {
 	Evas_Object o;
 	o = evas_add_image_from_file(evas, imagepath);
 	evas_set_color(evas, o, 255, 255, 255, 128);
-	evas_move(evas, o, x, y);
+	zoom(o, pixmap_size, pixmap_size); /* some pixmaps aren't the size we expect initially */
+	evas_move(evas, o, x, y); /* zoom before you do this */
 	evas_show(evas, o);
 	evas_callback_add(evas, o, CALLBACK_MOUSE_IN,   mouse_in,   NULL);
 	evas_callback_add(evas, o, CALLBACK_MOUSE_OUT,  mouse_out,  NULL);
@@ -76,7 +77,11 @@
 	char exec[1024], path[1024];
 
 	int x = 0;
+	int pixmap_spacing;
 
+	pixmap_spacing = plugin_read_float("icon_spacing");
+	if (pixmap_spacing == 0) pixmap_spacing=5;
+
 	if ((f = fopen(plugin_read_string("rc"), "r")) == NULL) {
 		perror("fopen");
 		return;
@@ -87,7 +92,7 @@
 		remove_trailing_newline(path);
 		if (exec[0] != 0 && path[0] != 0) {
 			add_icon(exec, path, plugin->x+x, plugin->y);
-			x += PIXMAP_SIZE + 5;
+			x += pixmap_size + pixmap_spacing;
 		}
 	}
 }
@@ -95,7 +100,12 @@
 void further_init(Plugin *_plugin) {
 	plugin = _plugin;
 	plugin->name = plugin_name;
-	if (plugin->y == -1) plugin->y = dpy_height - PIXMAP_SIZE;
+
+	pixmap_size = plugin_read_float("icon_size");
+	if (pixmap_size == 0) pixmap_size=48;
+	printf("pixmap_size %i\n", pixmap_size);
+	if (plugin->y < 0) plugin->y += dpy_height - pixmap_size + 1;
 
 	load_launcherrc();
+
 }