rpms/xfig/devel xfig-3.2.5-modepanel.patch, NONE, 1.1 xfig.spec, 1.51, 1.52

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/xfig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30624

Modified Files:
	xfig.spec 
Added Files:
	xfig-3.2.5-modepanel.patch 
Log Message:


xfig-3.2.5-modepanel.patch:

--- NEW FILE xfig-3.2.5-modepanel.patch ---
--- xfig.3.2.5/w_setup.c.dist	2008-07-13 23:49:46.000000000 -0400
+++ xfig.3.2.5/w_setup.c	2008-07-13 23:49:55.000000000 -0400
@@ -23,7 +23,7 @@
 #include "w_setup.h"
 #include "w_util.h"
 
-#define	NUM_DRAW_SW 17 /* kludge - shouldn't have to edit this by hand */
+#define	NUM_DRAW_SW 15 /* kludge - number of switches above draw line*/
 
 int		TOOL_WD, TOOL_HT;
 int		CMDFORM_WD, CMDFORM_HT = CMD_BUT_HT;
@@ -94,8 +94,10 @@
 
     /* space for both modepanel titles (Drawing modes and Editing modes) */
     MODEPANEL_SPACE = 1 + CANVAS_HT + RULER_WD - 
-	(MODE_SW_HT + INTERNAL_BW) * (ceil((double)NUM_DRAW_SW/SW_PER_ROW) +
-			ceil((double)(NUM_MODE_SW-NUM_DRAW_SW)/SW_PER_ROW));
+      (MODE_SW_HT + INTERNAL_BW) * 
+      (ceil(((double)NUM_DRAW_SW+1)/SW_PER_ROW) +
+       ceil(((double)NUM_MODE_SW-NUM_DRAW_SW)/SW_PER_ROW));
+
     if (MODEPANEL_SPACE < 2)
 	MODEPANEL_SPACE = 2;
 }


Index: xfig.spec
===================================================================
RCS file: /cvs/extras/rpms/xfig/devel/xfig.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- xfig.spec	3 Apr 2008 17:39:10 -0000	1.51
+++ xfig.spec	14 Jul 2008 08:39:05 -0000	1.52
@@ -3,7 +3,7 @@
 Summary: An X Window System tool for drawing basic vector graphics
 Name: xfig
 Version: 3.2.5
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: MIT
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
@@ -23,6 +23,7 @@
 Patch13: xfig-3.2.5-urwfonts.patch
 Patch14: xfig-3.2.5-zoom-crash.patch
 Patch15: xfig-3.2.5-missing-protos.patch
+Patch16: xfig-3.2.5-modepanel.patch
 
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -97,6 +98,7 @@
 %patch13 -p1 -b .urw
 %patch14 -p1 -b .zoom-crash
 %patch15 -p1
+%patch16 -p1
 ln -nfs Doc/xfig.man xfig.man
 find -type f -print0 | xargs -0 chmod -x
 rm `find Doc -name '*.orig'` Doc/html/*.save Doc/html/images/sav1a0.tmp
@@ -188,6 +190,10 @@
 
 
 %changelog
+
+* Mon Jul 14 2008 Ian Hutchinson <ihutch at mit.edu> 3.2.5-11
+- Fix incorrect height of modepanel.
+
 * Thu Apr  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.2.5-10
 - Fix missing prototype compiler warnings