Implement these functions. (#327226, Thomas Broyer)

2006-01-18  Anders Carlsson  <andersca@imendio.com>

        * gdk/quartz/gdkdrawable-quartz.c:
        (gdk_quartz_draw_polygon):
        (gdk_quartz_draw_lines):
	Implement these functions.
	(#327226, Thomas Broyer)
This commit is contained in:
Anders Carlsson 2006-01-18 09:47:56 +00:00 committed by Anders Carlsson
parent 617595dff2
commit 580d76a4f9
3 changed files with 68 additions and 8 deletions

View File

@ -1,9 +1,17 @@
2006-01-18 Anders Carlsson <andersca@imendio.com>
* gdk/quartz/gdkdrawable-quartz.c:
(gdk_quartz_draw_polygon):
(gdk_quartz_draw_lines):
Implement these functions.
(#327226, Thomas Broyer)
2006-01-18 Anders Carlsson <andersca@imendio.com>
* gdk/quartz/gdkkeys-quartz.c:
(maybe_update_keymap):
Support non-MacRoman keyboard layouts.
(#322585, Wolfgang Thaller)
(maybe_update_keymap):
Support non-MacRoman keyboard layouts.
(#322585, Wolfgang Thaller)
2006-01-18 Anders Carlsson <andersca@imendio.com>

View File

@ -1,9 +1,17 @@
2006-01-18 Anders Carlsson <andersca@imendio.com>
* gdk/quartz/gdkdrawable-quartz.c:
(gdk_quartz_draw_polygon):
(gdk_quartz_draw_lines):
Implement these functions.
(#327226, Thomas Broyer)
2006-01-18 Anders Carlsson <andersca@imendio.com>
* gdk/quartz/gdkkeys-quartz.c:
(maybe_update_keymap):
Support non-MacRoman keyboard layouts.
(#322585, Wolfgang Thaller)
(maybe_update_keymap):
Support non-MacRoman keyboard layouts.
(#322585, Wolfgang Thaller)
2006-01-18 Anders Carlsson <andersca@imendio.com>

View File

@ -209,7 +209,33 @@ gdk_quartz_draw_polygon (GdkDrawable *drawable,
GdkPoint *points,
gint npoints)
{
/* FIXME: Implement */
CGContextRef context = _gdk_quartz_drawable_get_context (drawable, FALSE, TRUE);
int i;
if (!context)
return;
_gdk_quartz_update_context_from_gc (context, gc);
if (filled)
_gdk_quartz_set_context_fill_color_from_pixel (context, gdk_drawable_get_colormap (drawable),
_gdk_gc_get_fg_pixel (gc));
else
_gdk_quartz_set_context_stroke_color_from_pixel (context, gdk_drawable_get_colormap (drawable),
_gdk_gc_get_fg_pixel (gc));
CGContextMoveToPoint (context, points[0].x, points[0].y);
for (i = 1; i < npoints; i++)
CGContextAddLineToPoint (context, points[i].x, points[i].y);
CGContextClosePath (context);
if (filled)
CGContextFillPath (context);
else
CGContextStrokePath (context);
_gdk_quartz_drawable_release_context (drawable, context);
}
static void
@ -338,7 +364,25 @@ gdk_quartz_draw_lines (GdkDrawable *drawable,
GdkPoint *points,
gint npoints)
{
/* FIXME: Implement */
CGContextRef context = _gdk_quartz_drawable_get_context (drawable, FALSE, TRUE);
int i;
if (!context)
return;
_gdk_quartz_update_context_from_gc (context, gc);
_gdk_quartz_set_context_stroke_color_from_pixel (context, gdk_drawable_get_colormap (drawable),
_gdk_gc_get_fg_pixel (gc));
for (i = 1; i < npoints; i++)
{
CGContextMoveToPoint (context, points[i - 1].x, points[i - 1].y);
CGContextAddLineToPoint (context, points[i].x, points[i].y);
}
CGContextStrokePath (context);
_gdk_quartz_drawable_release_context (drawable, context);
}
static void