diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2004-08-31 00:27:40 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2004-08-31 00:27:40 +0000 |
| commit | 57193e52c0ea34a6af53289b72b232e226466bc1 (patch) | |
| tree | 01532958535af427ce9d473f2b1b739ab501d5ea /src/Fl_Image.cxx | |
| parent | 62e1ae69768156c1f4db4a7193f74af944ab34f6 (diff) | |
Quartz for FLTK 1.1:
- added pixmap drawing (no masking yet)
- added bitmap drawing
- added line styles (complete)
todo:
- missing refresh (double test, fluid, others)
- missing pixmap mask
- color_chooser has alignment issues
- images scale instead of beeing scissored
- fonts
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3798 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Image.cxx')
| -rw-r--r-- | src/Fl_Image.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Fl_Image.cxx b/src/Fl_Image.cxx index 8cf8af3fa..bfb0fc0ab 100644 --- a/src/Fl_Image.cxx +++ b/src/Fl_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Image.cxx,v 1.5.2.3.2.35 2004/08/28 13:45:27 easysw Exp $" +// "$Id: Fl_Image.cxx,v 1.5.2.3.2.36 2004/08/31 00:27:40 matthiaswm Exp $" // // Image drawing code for the Fast Light Tool Kit (FLTK). // @@ -327,7 +327,6 @@ void Fl_RGB_Image::draw(int XP, int YP, int WP, int HP, int cx, int cy) { fl_begin_offscreen((Fl_Offscreen)id); fl_draw_image(array, 0, 0, w(), h(), d(), ld()); fl_end_offscreen(); - if (d() == 2 || d() == 4) { mask = fl_create_alphamask(w(), h(), d(), ld(), array); } @@ -380,10 +379,11 @@ void Fl_RGB_Image::draw(int XP, int YP, int WP, int HP, int cx, int cy) { fl_copy_offscreen(X, Y, W, H, (Fl_Offscreen)id, cx, cy); } #elif defined(__APPLE_QUARTZ__) -# warning : Quartz implementation not finished yet if (id && fl_gc) { - CGRect rect = { X, Y, w(), h() }; + CGRect rect = { X, Y, W, H }; + Fl_X::q_begin_image(rect, cx, cy); CGContextDrawImage(fl_gc, rect, (CGImageRef)id); + Fl_X::q_end_image(); } #else if (mask) { @@ -418,5 +418,5 @@ void Fl_RGB_Image::label(Fl_Menu_Item* m) { // -// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.35 2004/08/28 13:45:27 easysw Exp $". +// End of "$Id: Fl_Image.cxx,v 1.5.2.3.2.36 2004/08/31 00:27:40 matthiaswm Exp $". // |