Commit f6db9670 authored by jaycox's avatar jaycox

use $(PERL) instead of perl render properly in non-square aspect ratios.


	* gtk/Makefile.am: use $(PERL) instead of perl
	* gtk/gtkcolorsel.c: render properly in non-square aspect ratios.
	also much faster to render.
parent 8d3a8957
Mon Sep 21 01:12:44 1998 Jay Cox (jaycox@earthlink.net)
* gtk/Makefile.am: use $(PERL) instead of perl
* gtk/gtkcolorsel.c: render properly in non-square aspect ratios.
also much faster to render.
Mon Sep 21 07:44:30 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.c (gtk_object_class_add_signals): reallocate
......
Mon Sep 21 01:12:44 1998 Jay Cox (jaycox@earthlink.net)
* gtk/Makefile.am: use $(PERL) instead of perl
* gtk/gtkcolorsel.c: render properly in non-square aspect ratios.
also much faster to render.
Mon Sep 21 07:44:30 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.c (gtk_object_class_add_signals): reallocate
......
Mon Sep 21 01:12:44 1998 Jay Cox (jaycox@earthlink.net)
* gtk/Makefile.am: use $(PERL) instead of perl
* gtk/gtkcolorsel.c: render properly in non-square aspect ratios.
also much faster to render.
Mon Sep 21 07:44:30 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.c (gtk_object_class_add_signals): reallocate
......
Mon Sep 21 01:12:44 1998 Jay Cox (jaycox@earthlink.net)
* gtk/Makefile.am: use $(PERL) instead of perl
* gtk/gtkcolorsel.c: render properly in non-square aspect ratios.
also much faster to render.
Mon Sep 21 07:44:30 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.c (gtk_object_class_add_signals): reallocate
......
Mon Sep 21 01:12:44 1998 Jay Cox (jaycox@earthlink.net)
* gtk/Makefile.am: use $(PERL) instead of perl
* gtk/gtkcolorsel.c: render properly in non-square aspect ratios.
also much faster to render.
Mon Sep 21 07:44:30 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.c (gtk_object_class_add_signals): reallocate
......
Mon Sep 21 01:12:44 1998 Jay Cox (jaycox@earthlink.net)
* gtk/Makefile.am: use $(PERL) instead of perl
* gtk/gtkcolorsel.c: render properly in non-square aspect ratios.
also much faster to render.
Mon Sep 21 07:44:30 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.c (gtk_object_class_add_signals): reallocate
......
Mon Sep 21 01:12:44 1998 Jay Cox (jaycox@earthlink.net)
* gtk/Makefile.am: use $(PERL) instead of perl
* gtk/gtkcolorsel.c: render properly in non-square aspect ratios.
also much faster to render.
Mon Sep 21 07:44:30 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.c (gtk_object_class_add_signals): reallocate
......
......@@ -233,7 +233,7 @@ gdk_headers = \
# generate gtk.defs file from gtk-boxed.defs and *.h
gtk.defs: @REBUILD@ makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers)
cd $(srcdir) \
&& perl makeenums.pl defs $(source_headers) $(gdk_headers) > s-gd \
&& $(PERL) makeenums.pl defs $(source_headers) $(gdk_headers) > s-gd \
&& cat gtk-boxed.defs >> s-gd \
&& mv s-gd gtk.defs
......@@ -258,11 +258,12 @@ gtktypebuiltins_ids.c: @REBUILD@ gtk.defs maketypes.awk
# generate enum value arrays
gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl gtk.defs
cd $(srcdir) \
&& perl makeenums.pl arrays $(source_headers) $(gdk_headers) > s-gtbe \
&& $(PERL) makeenums.pl arrays $(source_headers) $(gdk_headers) > \
s-gtbe \
&& mv s-gtbe gtktypebuiltins_evals.c
gtkmarshal.c gtkmarshal.h: @REBUILD@ gtkmarshal.list genmarshal.pl
srcdir=$(srcdir) INDENT=$(INDENT) perl $(srcdir)/genmarshal.pl
srcdir=$(srcdir) INDENT=$(INDENT) $(PERL) $(srcdir)/genmarshal.pl
# ???
# special remake rules
......
......@@ -1295,11 +1295,14 @@ gtk_color_selection_eval_wheel (gint x, gint y,
{
gdouble d, r, rx, ry, l;
rx = (gdouble) x - cx;
ry = (gdouble) y - cy;
rx = ((gdouble) x - cx);
ry = ((gdouble) y - cy);
d = (SQR (cy) * SQR (rx) + SQR (cx) * SQR (ry) - SQR (cx) * SQR (cy));
rx = rx/cx;
ry = ry/cy;
r = sqrt (SQR (rx) + SQR (ry));
if (r != 0.0)
......@@ -1307,16 +1310,17 @@ gtk_color_selection_eval_wheel (gint x, gint y,
else
*h = 0.0;
l = sqrt (SQR ((cx * cos (*h + 0.5 * M_PI))) + SQR ((cy * sin (*h + 0.5 * M_PI))));
*s = r / l;
*s = r;
*h = 360.0 * (*h) / (2.0 * M_PI) + 180;
if (*s == 0.0)
*s = 0.00001;
else if (*s > 1.0)
{
*s = 1.0;
return ((d > 0.0));
return 1;
}
return 0;
}
static void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment