From 0ddaed29e9a47be6503ab9a976590338b82ae29e Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 31 Mar 2004 00:50:13 +0000 Subject: [PATCH 1/1] Use X11 semantics for angles. Thanks to Tim Newsham. 2004-03-31 Tor Lillqvist * gdk/win32/gdkdrawable-win32.c (draw_arc): Use X11 semantics for angles. Thanks to Tim Newsham. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/win32/gdkdrawable-win32.c | 26 +++++++++++--------------- 6 files changed, 36 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index a80ea0f3c..635a1a17d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-03-31 Tor Lillqvist + + * gdk/win32/gdkdrawable-win32.c (draw_arc): Use X11 semantics for + angles. Thanks to Tim Newsham. + 2004-03-29 Federico Mena Quintero Fix #137520. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a80ea0f3c..635a1a17d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-03-31 Tor Lillqvist + + * gdk/win32/gdkdrawable-win32.c (draw_arc): Use X11 semantics for + angles. Thanks to Tim Newsham. + 2004-03-29 Federico Mena Quintero Fix #137520. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a80ea0f3c..635a1a17d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2004-03-31 Tor Lillqvist + + * gdk/win32/gdkdrawable-win32.c (draw_arc): Use X11 semantics for + angles. Thanks to Tim Newsham. + 2004-03-29 Federico Mena Quintero Fix #137520. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a80ea0f3c..635a1a17d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-03-31 Tor Lillqvist + + * gdk/win32/gdkdrawable-win32.c (draw_arc): Use X11 semantics for + angles. Thanks to Tim Newsham. + 2004-03-29 Federico Mena Quintero Fix #137520. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a80ea0f3c..635a1a17d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-03-31 Tor Lillqvist + + * gdk/win32/gdkdrawable-win32.c (draw_arc): Use X11 semantics for + angles. Thanks to Tim Newsham. + 2004-03-29 Federico Mena Quintero Fix #137520. diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c index 026e1ac2d..acc6757f7 100644 --- 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) -- 2.43.2