summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2018-05-05 10:59:27 +0000
committerManolo Gouy <Manolo>2018-05-05 10:59:27 +0000
commit13b328e75a71a11a854b5a1e07ab7de0aa513743 (patch)
tree13824764df0cd0c4017e24ee7fbd7388ec749b2a /src
parenteee5c5800c495efbb4208308666ee2fd2d055a1b (diff)
Improve Fl_Screen_Driver::traverse_to_gl_subwindows(), still needs to be completed.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12899 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/Fl_Screen_Driver.cxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Fl_Screen_Driver.cxx b/src/Fl_Screen_Driver.cxx
index 85a60109c..0f5008e32 100644
--- a/src/Fl_Screen_Driver.cxx
+++ b/src/Fl_Screen_Driver.cxx
@@ -191,8 +191,7 @@ Fl_RGB_Image *Fl_Screen_Driver::traverse_to_gl_subwindows(Fl_Group *g, int x, in
if (!pi) return full_img;
full_img = pi->rectangle_capture(g, x, y, w, h);
}
- else if ( g->as_window() && (!full_img || (g->window() && g->window()->as_gl_window())) ) {
- // the starting window or one inside a GL window
+ else if ( g->as_window()/* && (!full_img || (g->window() && g->window()->as_gl_window()))*/ ) {
if (full_img) g->as_window()->make_current();
full_img = Fl::screen_driver()->read_win_rectangle(x, y, w, h);
}
@@ -217,11 +216,11 @@ Fl_RGB_Image *Fl_Screen_Driver::traverse_to_gl_subwindows(Fl_Group *g, int x, in
origin_y - c->y(), width, height, full_img);
if (img == full_img) continue;
int top;
- if (c->as_gl_window()) {
+ //if (c->as_gl_window()) {
top = origin_y - y;
- } else {
+ /*} else {
top = full_img->h() - (origin_y - y + img->h());
- }
+ }*/
write_image_inside(full_img, img, (origin_x - x) * full_img_scale, top * full_img_scale);
delete img;
}