From 8130f16538f62c87d948e2af8924737126a2876f Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Mon, 5 Jun 2006 09:01:29 +0000 Subject: OS X Quartz rendering: text is now clipped and drawn in the correct color. I had to reverse the 'selection color' change because some widgets rely on this color being dark. Still problems with Fluid rendering and measuring fonts before a window is open. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5174 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_mac.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/Fl_mac.cxx') diff --git a/src/Fl_mac.cxx b/src/Fl_mac.cxx index 5a7db50ac..c7a03531a 100644 --- a/src/Fl_mac.cxx +++ b/src/Fl_mac.cxx @@ -2085,7 +2085,7 @@ extern class Fl_FontSize *fl_fontsize; extern void fl_font(class Fl_FontSize*); extern void fl_quartz_restore_line_style_(); -// FLTK has only on global graphics state. This function copies the FLTK state into the +// FLTK has only one global graphics state. This function copies the FLTK state into the // current Quartz context void Fl_X::q_fill_context() { if (!fl_gc) return; @@ -2099,14 +2099,12 @@ void Fl_X::q_fill_context() { } CGContextTranslateCTM(fl_gc, 0.5, hgt-0.5f); CGContextScaleCTM(fl_gc, 1.0f, -1.0f); - static CGAffineTransform font_mx = { 1, 0, 0, -1, 0, 0 }; - CGContextSetTextMatrix(fl_gc, font_mx); fl_font(fl_fontsize); fl_color(fl_color_); fl_quartz_restore_line_style_(); } -// The only way to reste clipping to its original state is to pop the current graphics +// The only way to reset clipping to its original state is to pop the current graphics // state and restore the global state. void Fl_X::q_clear_clipping() { if (!fl_gc) return; -- cgit v1.2.3