summaryrefslogtreecommitdiff
blob: 092983b3fdf8c1ab8e0470f7d29cdda3518e13d4 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
--- gkrellmms.c.orig	Tue Feb 19 07:32:16 2002
+++ gkrellmms.c	Tue Feb 19 07:56:24 2002
@@ -687,7 +687,22 @@
     if (bg_scroll_image)
        		gkrellm_set_image_border("gkrellmms_bg_scroll",
        		bg_scroll_image, scroll_style);
-#if ((VERSION_MAJOR>1)||(VERSION_MAJOR==1 && VERSION_MINOR==0 && VERSION_REV>2)||(VERSION_MAJOR==1 && VERSION_MINOR>0))
+#if (	(VERSION_MAJOR>1) \
+	 || (VERSION_MAJOR==1 && VERSION_MINOR==2 && VERSION_REV>8) \
+	 || (VERSION_MAJOR==1 && VERSION_MINOR>2))
+	{
+	Margin	margin;
+
+	margin = *gkrellm_get_style_margins(scroll_style);
+	if (gkrellm_get_gkrellmrc_integer("gkrellmms_scroll_margin", &margin.left))
+		margin.right = margin.left;
+	gkrellm_get_gkrellmrc_integer("gkrellmms_scroll_top_margin", &margin.top);
+	gkrellm_get_gkrellmrc_integer("gkrellmms_scroll_bottom_margin",
+		&margin.bottom);
+	gkrellm_set_style_margins(scroll_style, &margin);
+	}
+#elif (   (VERSION_MAJOR==1 && VERSION_MINOR==0 && VERSION_REV>2)
+		||(VERSION_MAJOR==1 && VERSION_MINOR>0))
 	gkrellm_get_gkrellmrc_integer("gkrellmms_scroll_margin",
        		&scroll_style->margin);
 	gkrellm_get_gkrellmrc_integer("gkrellmms_scroll_top_margin",