diff options
Diffstat (limited to 'src/Fl_Menu.cxx')
| -rw-r--r-- | src/Fl_Menu.cxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx index 1162c0238..224645b95 100644 --- a/src/Fl_Menu.cxx +++ b/src/Fl_Menu.cxx @@ -276,13 +276,7 @@ menuwindow::menuwindow(const Fl_Menu_Item* m, int X, int Y, int Wp, int Hp, int scr_x, scr_y, scr_w, scr_h; int tx = X, ty = Y; - Fl::screen_xywh(scr_x, scr_y, scr_w, scr_h); -#ifdef __APPLE__ - scr_x = Fl::x(); - scr_w = Fl::w(); -#endif - scr_y = Fl::y(); - scr_h = Fl::h(); + Fl::screen_work_area(scr_x, scr_y, scr_w, scr_h); if (!right_edge || right_edge > scr_x+scr_w) right_edge = scr_x+scr_w; end(); @@ -417,8 +411,8 @@ void menuwindow::autoscroll(int n) { int scr_y, scr_h; int Y = y()+Fl::box_dx(box())+2+n*itemheight; - scr_y = Fl::y(); - scr_h = Fl::h(); + int xx, ww; + Fl::screen_work_area(xx, scr_y, ww, scr_h); if (Y <= scr_y) Y = scr_y-Y+10; else { Y = Y+itemheight-scr_h-scr_y; |