gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Fl_{Wayland|Xlib}_{Copy|Image}_Surface_Driver::set_current()

Browse Source 
Member function Fl_Cairo_Graphics_Driver::set_cairo() needs be called only to initialize the driver.
Doing it also later undoes the effect of Fl_Widget_Surface::translate() if used
when Fl_Surface_Device::pop_current() calls the overridden Fl_Surface_Device::set_current().
This commit is contained in:
ManoloFLTK 2025-01-10 08:20:01 +01:00
parent c0c2cf7d40
commit 7bb8bdb1fa
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/drivers/Wayland/Fl_Wayland_Copy_Surface_Driver.cxx
View File

@ -45,7 +45,8 @@ Fl_Wayland_Copy_Surface_Driver::~Fl_Wayland_Copy_Surface_Driver() {
void Fl_Wayland_Copy_Surface_Driver::set_current() {
Fl_Surface_Device::set_current();
((Fl_Wayland_Graphics_Driver*)driver())->set_cairo((cairo_t*)img_surf->offscreen());
Fl_Cairo_Graphics_Driver *dr = (Fl_Cairo_Graphics_Driver*)driver();
if (!dr->cr()) dr->set_cairo((cairo_t*)img_surf->offscreen());
}

3
src/drivers/Wayland/Fl_Wayland_Image_Surface_Driver.cxx
View File

@ -76,7 +76,8 @@ Fl_Wayland_Image_Surface_Driver::~Fl_Wayland_Image_Surface_Driver() {
void Fl_Wayland_Image_Surface_Driver::set_current() {
Fl_Surface_Device::set_current();
((Fl_Wayland_Graphics_Driver*)fl_graphics_driver)->set_cairo((cairo_t*)offscreen);
Fl_Cairo_Graphics_Driver *dr = (Fl_Cairo_Graphics_Driver*)driver();
if (!dr->cr()) dr->set_cairo((cairo_t*)offscreen);
pre_window = Fl_Wayland_Window_Driver::wld_window;
Fl_Wayland_Window_Driver::wld_window = NULL;
fl_window = 0;

3
src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx
View File

@ -78,7 +78,8 @@ void Fl_Xlib_Copy_Surface_Driver::set_current() {
oldwindow = fl_window;
fl_window = xid->offscreen();
#if FLTK_USE_CAIRO
((Fl_X11_Cairo_Graphics_Driver*)driver())->set_cairo(cairo_);
Fl_Cairo_Graphics_Driver *dr = (Fl_Cairo_Graphics_Driver*)driver();
if (!dr->cr()) dr->set_cairo(cairo_);
#endif
}

3
src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx
View File

@ -82,7 +82,8 @@ void Fl_Xlib_Image_Surface_Driver::set_current() {
pre_window = fl_window;
fl_window = offscreen;
#if FLTK_USE_CAIRO
((Fl_X11_Cairo_Graphics_Driver*)driver())->set_cairo(cairo_);
Fl_Cairo_Graphics_Driver *dr = (Fl_Cairo_Graphics_Driver*)driver();
if (!dr->cr()) dr->set_cairo(cairo_);
#endif
}