Use X11 semantics for angles. Thanks to Tim Newsham.

2004-03-31  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkdrawable-win32.c (draw_arc): Use X11 semantics for
	angles. Thanks to Tim Newsham.

diff --git a/ChangeLog b/ChangeLog
index a80ea0f3cd6611da4e1313bf412f31aa34806e14..635a1a17d342c4aed58369fec1b2735849b53165 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-31  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdrawable-win32.c (draw_arc): Use X11 semantics for
+       angles. Thanks to Tim Newsham.
+
 2004-03-29  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #137520.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a80ea0f3cd6611da4e1313bf412f31aa34806e14..635a1a17d342c4aed58369fec1b2735849b53165 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-03-31  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdrawable-win32.c (draw_arc): Use X11 semantics for
+       angles. Thanks to Tim Newsham.
+
 2004-03-29  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #137520.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a80ea0f3cd6611da4e1313bf412f31aa34806e14..635a1a17d342c4aed58369fec1b2735849b53165 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2004-03-31  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdrawable-win32.c (draw_arc): Use X11 semantics for
+       angles. Thanks to Tim Newsham.
+
 2004-03-29  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #137520.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a80ea0f3cd6611da4e1313bf412f31aa34806e14..635a1a17d342c4aed58369fec1b2735849b53165 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-03-31  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdrawable-win32.c (draw_arc): Use X11 semantics for
+       angles. Thanks to Tim Newsham.
+
 2004-03-29  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #137520.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a80ea0f3cd6611da4e1313bf412f31aa34806e14..635a1a17d342c4aed58369fec1b2735849b53165 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-03-31  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdrawable-win32.c (draw_arc): Use X11 semantics for
+       angles. Thanks to Tim Newsham.
+
 2004-03-29  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #137520.

diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c
index 026e1ac2d203f37de05c9dc2ced199ae44b1524d..acc6757f786774bd988e4537ea9260950ad83eaa 100644 (file)
--- a/gdk/win32/gdkdrawable-win32.c
+++ b/gdk/win32/gdkdrawable-win32.c
@@ -802,12 +802,9 @@ draw_arc (GdkGCWin32 *gcwin32,
 {
   HGDIOBJ old_pen;
   gboolean filled;
-  gint x;
-  gint y;
-  gint width;
-  gint height;
-  gint angle1;
-  gint angle2;
+  gint x, y;
+  gint width, height;
+  gint angle1, angle2;
   int nXStartArc, nYStartArc, nXEndArc, nYEndArc;
 
   filled = va_arg (args, gboolean);
@@ -827,18 +824,17 @@ draw_arc (GdkGCWin32 *gcwin32,
     }
   else if (angle2 > 0)
     {
-      /* The 100. is just an arbitrary value */
-      nXStartArc = x + width/2 + 100. * cos(angle1/64.*2.*G_PI/360.);
-      nYStartArc = y + height/2 + -100. * sin(angle1/64.*2.*G_PI/360.);
-      nXEndArc = x + width/2 + 100. * cos((angle1+angle2)/64.*2.*G_PI/360.);
-      nYEndArc = y + height/2 + -100. * sin((angle1+angle2)/64.*2.*G_PI/360.);
+      nXStartArc = x + width/2 + width * cos(angle1/64.*2.*G_PI/360.);
+      nYStartArc = y + height/2 + -height * sin(angle1/64.*2.*G_PI/360.);
+      nXEndArc = x + width/2 + width * cos((angle1+angle2)/64.*2.*G_PI/360.);
+      nYEndArc = y + height/2 + -height * sin((angle1+angle2)/64.*2.*G_PI/360.);
     }
   else
     {
-      nXEndArc = x + width/2 + 100. * cos(angle1/64.*2.*G_PI/360.);
-      nYEndArc = y + height/2 + -100. * sin(angle1/64.*2.*G_PI/360.);
-      nXStartArc = x + width/2 + 100. * cos((angle1+angle2)/64.*2.*G_PI/360.);
-      nYStartArc = y + height/2 + -100. * sin((angle1+angle2)/64.*2.*G_PI/360.);
+      nXEndArc = x + width/2 + width * cos(angle1/64.*2.*G_PI/360.);
+      nYEndArc = y + height/2 + -height * sin(angle1/64.*2.*G_PI/360.);
+      nXStartArc = x + width/2 + width * cos((angle1+angle2)/64.*2.*G_PI/360.);
+      nYStartArc = y + height/2 + -height * sin((angle1+angle2)/64.*2.*G_PI/360.);
     }
   
   if (filled)