From 6bcadf536f1ccda3f52967375dc49d7b6e6b00fe Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Tue, 15 Aug 2017 14:30:48 +0000 Subject: Fl_XXX_Surface_Driver::set_current() : call Fl_Surface_Device::set_current() first to get fl_window right. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12383 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx | 1 - src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx | 2 +- src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx index 9dd722fb9..e69c163b0 100644 --- a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx @@ -77,7 +77,6 @@ void Fl_Quartz_Image_Surface_Driver::set_current() { pre_window = fl_window; driver()->gc(offscreen); fl_window = 0; - Fl_Surface_Device::set_current(); ((Fl_Quartz_Graphics_Driver*)driver())->high_resolution( CGBitmapContextGetWidth(offscreen) > width ); } diff --git a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx index b96a4f410..d804ac9ad 100644 --- a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx @@ -77,9 +77,9 @@ Fl_Xlib_Copy_Surface_Driver::~Fl_Xlib_Copy_Surface_Driver() { void Fl_Xlib_Copy_Surface_Driver::set_current() { + Fl_Surface_Device::set_current(); oldwindow = fl_window; fl_window = xid; - Fl_Surface_Device::set_current(); } void Fl_Xlib_Copy_Surface_Driver::end_current_(Fl_Surface_Device*) { diff --git a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx index fa2aaeb5d..d4e49b513 100644 --- a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx @@ -65,8 +65,8 @@ Fl_Xlib_Image_Surface_Driver::~Fl_Xlib_Image_Surface_Driver() { } void Fl_Xlib_Image_Surface_Driver::set_current() { - pre_window = fl_window; Fl_Surface_Device::set_current(); + pre_window = fl_window; fl_window = offscreen; fl_push_no_clip(); } -- cgit v1.2.3