Author: manolo
Date: 2011-10-31 12:44:55 -0700 (Mon, 31 Oct 2011)
New Revision: 9163
Log:
Fix STR #2759: Fl_Window::hotspot() now positions a new window correctly on a
secondary display.
Modified:
branches/branch-1.3/src/Fl_Window_hotspot.cxx
Modified: branches/branch-1.3/src/Fl_Window_hotspot.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Window_hotspot.cxx 2011-10-30 17:32:07 UTC
(rev 9162)
+++ branches/branch-1.3/src/Fl_Window_hotspot.cxx 2011-10-31 19:44:55 UTC
(rev 9163)
@@ -32,7 +32,7 @@
// stays on the screen, if possible.
if (!offscreen) {
int scr_x, scr_y, scr_w, scr_h;
- Fl::screen_xywh(scr_x, scr_y, scr_w, scr_h);
+ Fl::screen_work_area(scr_x, scr_y, scr_w, scr_h);
int top = 0;
int left = 0;
@@ -64,10 +64,10 @@
#endif
}
// now insure contents are on-screen (more important than border):
- if (X+w()+right > scr_w-scr_x) X = scr_w-scr_x-right-w();
- if (X-left < scr_x) X = left;
- if (Y+h()+bottom > scr_h-scr_y) Y = scr_h-scr_y-bottom-h();
- if (Y-top < scr_y) Y = top;
+ if (X+w()+right > scr_w+scr_x) X = scr_w+scr_x-right-w();
+ if (X-left < scr_x) X = left + scr_x;
+ if (Y+h()+bottom > scr_h+scr_y) Y = scr_h+scr_y-bottom-h();
+ if (Y-top < scr_y) Y = top + scr_y;
// make sure that we will force this position
if (X==x()) x(X-1);
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
