Mercurial > emacs
diff src/macterm.c @ 80788:74541c8c7ba2
(mac_draw_rectangle) [USE_CG_DRAWING]: Fix rectangle calculation.
author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
---|---|
date | Tue, 02 Sep 2008 08:19:06 +0000 |
parents | 5e49fbefd047 |
children |
line wrap: on
line diff
--- a/src/macterm.c Sat Aug 30 22:34:03 2008 +0000 +++ b/src/macterm.c Tue Sep 02 08:19:06 2008 +0000 @@ -476,25 +476,21 @@ unsigned int width, height; { #if USE_CG_DRAWING - { - CGContextRef context; - - context = mac_begin_cg_clip (f, gc); - CG_SET_FILL_COLOR_WITH_GC_BACKGROUND (context, gc); - CGContextFillRect (context, mac_rect_make (f, x, y, width, height)); - mac_end_cg_clip (f); - } + CGContextRef context; + + context = mac_begin_cg_clip (f, gc); + CG_SET_FILL_COLOR_WITH_GC_BACKGROUND (context, gc); + CGContextFillRect (context, mac_rect_make (f, x, y, width, height)); + mac_end_cg_clip (f); #else - { - Rect r; - - mac_begin_clip (f, gc); - RGBBackColor (GC_BACK_COLOR (gc)); - SetRect (&r, x, y, x + width, y + height); - EraseRect (&r); - RGBBackColor (GC_BACK_COLOR (FRAME_NORMAL_GC (f))); - mac_end_clip (f, gc); - } + Rect r; + + mac_begin_clip (f, gc); + RGBBackColor (GC_BACK_COLOR (gc)); + SetRect (&r, x, y, x + width, y + height); + EraseRect (&r); + RGBBackColor (GC_BACK_COLOR (FRAME_NORMAL_GC (f))); + mac_end_clip (f, gc); #endif } @@ -517,16 +513,14 @@ struct frame *f; { #if USE_CG_DRAWING - { - CGContextRef context; - GC gc = FRAME_NORMAL_GC (f); - - context = mac_begin_cg_clip (f, NULL); - CG_SET_FILL_COLOR_WITH_GC_BACKGROUND (context, gc); - CGContextFillRect (context, CGRectMake (0, 0, FRAME_PIXEL_WIDTH (f), - FRAME_PIXEL_HEIGHT (f))); - mac_end_cg_clip (f); - } + CGContextRef context; + GC gc = FRAME_NORMAL_GC (f); + + context = mac_begin_cg_clip (f, NULL); + CG_SET_FILL_COLOR_WITH_GC_BACKGROUND (context, gc); + CGContextFillRect (context, CGRectMake (0, 0, FRAME_PIXEL_WIDTH (f), + FRAME_PIXEL_HEIGHT (f))); + mac_end_cg_clip (f); #else /* !USE_CG_DRAWING */ mac_begin_clip (f, NULL); RGBBackColor (GC_BACK_COLOR (FRAME_NORMAL_GC (f))); @@ -840,11 +834,12 @@ { #if USE_CG_DRAWING CGContextRef context; + CGRect rect; context = mac_begin_cg_clip (f, gc); CG_SET_STROKE_COLOR_WITH_GC_FOREGROUND (context, gc); - CGContextStrokeRect (context, - CGRectMake (x + 0.5f, y + 0.5f, width, height)); + rect = mac_rect_make (f, x, y, width + 1, height + 1); + CGContextStrokeRect (context, CGRectInset (rect, 0.5f, 0.5f)); mac_end_cg_clip (f); #else Rect r;