Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-27 10:57:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check boundary conditions in Cocoa scroll code (#554)

Browse Source
This commit is contained in:
Matthias Melcher
2022-11-24 12:44:08 +01:00
committed by GitHub
parent 8978bd1a84
commit 12dccaf711
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
+11 -7
View File
@@ -233,14 +233,18 @@ void Fl_Cocoa_Window_Driver::hide() {
int Fl_Cocoa_Window_Driver::scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y, void (*draw_area)(void*, int,int,int,int), void* data) int Fl_Cocoa_Window_Driver::scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y, void (*draw_area)(void*, int,int,int,int), void* data)
{ {
if ( (src_x < 0) || (src_y < 0) )
return 1;
if ( (src_x+src_w > pWindow->w()) || (src_y+src_h > pWindow->h()) )
return 1;
CGImageRef img = CGImage_from_window_rect(src_x, src_y, src_w, src_h); CGImageRef img = CGImage_from_window_rect(src_x, src_y, src_w, src_h);
if (img) { if (!img)
// the current surface is generally the display, but is an Fl_Image_Surface when scrolling an Fl_Overlay_Window return 1;
Fl_Quartz_Graphics_Driver *qgd = (Fl_Quartz_Graphics_Driver*)Fl_Surface_Device::surface()->driver(); // the current surface is generally the display, but is an Fl_Image_Surface when scrolling an Fl_Overlay_Window
float s = qgd->scale(); Fl_Quartz_Graphics_Driver *qgd = (Fl_Quartz_Graphics_Driver*)Fl_Surface_Device::surface()->driver();
qgd->draw_CGImage(img, dest_x, dest_y, lround(s*src_w), lround(s*src_h), 0, 0, src_w, src_h); float s = qgd->scale();
CFRelease(img); qgd->draw_CGImage(img, dest_x, dest_y, lround(s*src_w), lround(s*src_h), 0, 0, src_w, src_h);
} CFRelease(img);
return 0; return 0;
} }