mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows: avoid changing the current Fl_Surface_Device when drawing an Fl_Double_Window.

Browse Source 
This change was previously attempted at r.12792 but the test/offscreen demo did not run well with it.
This commit fixes the problem: the global fl_window should not be changed when drawing to
an Fl_Double_Window.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12868 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2018-04-24 10:45:30 +00:00
parent ece56437a6
commit c82fca51fa
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
View File

@ -307,7 +307,7 @@ void Fl_WinAPI_Window_Driver::flush_double()
} }
if (pWindow->damage() & ~FL_DAMAGE_EXPOSE) { if (pWindow->damage() & ~FL_DAMAGE_EXPOSE) {
fl_clip_region(i->region); i->region = 0; fl_clip_region(i->region); i->region = 0;
#if 1 /* Short form that transiently changes the current Fl_Surface_Device */ #if 0 /* Short form that transiently changes the current Fl_Surface_Device */
fl_begin_offscreen(other_xid); fl_begin_offscreen(other_xid);
fl_graphics_driver->clip_region( 0 ); fl_graphics_driver->clip_region( 0 );
draw(); draw();
@ -317,10 +317,8 @@ void Fl_WinAPI_Window_Driver::flush_double()
The code run in the window draw() method can call Fl_Surface_Device::surface() The code run in the window draw() method can call Fl_Surface_Device::surface()
and conclude that it's drawing to the display, which is ultimately true and conclude that it's drawing to the display, which is ultimately true
for an Fl_Double_Window. for an Fl_Double_Window.
With this form, test/offscreen does not work ==> needs investigation.
*/ */
HDC sgc = fl_gc; HDC sgc = fl_gc;
Window save_w = fl_window; fl_window = (Window)other_xid;
fl_gc = fl_makeDC(other_xid); fl_gc = fl_makeDC(other_xid);
int savedc = SaveDC(fl_gc); int savedc = SaveDC(fl_gc);
fl_graphics_driver->gc(fl_gc); fl_graphics_driver->gc(fl_gc);
@ -328,7 +326,6 @@ void Fl_WinAPI_Window_Driver::flush_double()
draw(); draw();
RestoreDC(fl_gc, savedc); RestoreDC(fl_gc, savedc);
DeleteDC(fl_gc); DeleteDC(fl_gc);
fl_window = save_w;
fl_graphics_driver->gc(sgc); fl_graphics_driver->gc(sgc);
#endif #endif
} }