diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-03-31 20:31:39 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-03-31 20:31:39 +0000 |
| commit | 782abe6de6c801f48f98fe55a6a9b8626d7bd4ec (patch) | |
| tree | 42631bcd85eccc4b6e7eff2f9f06c6cbf6dd77c0 /src/fl_show_colormap.cxx | |
| parent | 3ec9646eeadbfa63c5fdd975f36791852b1e2c37 (diff) | |
Added MacOS X monitor support.
Now use new screen_xywh() API for keeping things on the current screen.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4227 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/fl_show_colormap.cxx')
| -rw-r--r-- | src/fl_show_colormap.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/fl_show_colormap.cxx b/src/fl_show_colormap.cxx index ae77c955a..48accfc1d 100644 --- a/src/fl_show_colormap.cxx +++ b/src/fl_show_colormap.cxx @@ -116,8 +116,12 @@ int ColorMenu::handle(int e) { int by = (c/8)*BOXSIZE+BORDER; int px = x(); int py = y(); - if (px+bx+BOXSIZE+BORDER >= Fl::w()) px = Fl::w()-bx-BOXSIZE-BORDER; - if (py+by+BOXSIZE+BORDER >= Fl::h()) py = Fl::h()-by-BOXSIZE-BORDER; + int scr_x, scr_y, scr_w, scr_h; + Fl::screen_xywh(scr_x, scr_y, scr_w, scr_h); + if (px < scr_x) px = scr_x; + if (px+bx+BOXSIZE+BORDER >= scr_x+scr_w) px = scr_x+scr_w-bx-BOXSIZE-BORDER; + if (py < scr_y) py = scr_y; + if (py+by+BOXSIZE+BORDER >= scr_y+scr_h) py = scr_y+scr_h-by-BOXSIZE-BORDER; if (px+bx < BORDER) px = BORDER-bx; if (py+by < BORDER) py = BORDER-by; position(px,py); |