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

Fixed position of menu titles (STR #794)

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4259 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
2005-04-10 18:49:43 +00:00
parent 9edf9a743e
commit ba3bde19c5
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+1
View File
@@ -2,6 +2,7 @@ CHANGES IN FLTK 1.1.7
- Documentation fixes (STR #648, STR #692, STR #730, STR - Documentation fixes (STR #648, STR #692, STR #730, STR
#744, STR #745) #744, STR #745)
- Fixed position of menu titles (STR #794)
- Added missing Fl_Window::copy_label() method. - Added missing Fl_Window::copy_label() method.
- Fixed wrong tooltip in fluid (STR #784) - Fixed wrong tooltip in fluid (STR #784)
- Added zlib path to fluid (STR #783) - Added zlib path to fluid (STR #783)
src/Fl_Menu.cxx
+2 -1
View File
@@ -240,6 +240,7 @@ menuwindow::menuwindow(const Fl_Menu_Item* m, int X, int Y, int Wp, int Hp,
: Fl_Menu_Window(X, Y, Wp, Hp, 0) : Fl_Menu_Window(X, Y, Wp, Hp, 0)
{ {
int scr_x, scr_y, scr_w, scr_h; 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); Fl::screen_xywh(scr_x, scr_y, scr_w, scr_h);
if (!right_edge || right_edge > scr_x+scr_w) right_edge = scr_x+scr_w; if (!right_edge || right_edge > scr_x+scr_w) right_edge = scr_x+scr_w;
@@ -310,7 +311,7 @@ menuwindow::menuwindow(const Fl_Menu_Item* m, int X, int Y, int Wp, int Hp,
if (t) { if (t) {
int dy = menubar_title ? Fl::box_dy(button->box())+1 : 2; int dy = menubar_title ? Fl::box_dy(button->box())+1 : 2;
int ht = menubar_title ? button->h()-dy*2 : Htitle+2*BW+3; int ht = menubar_title ? button->h()-dy*2 : Htitle+2*BW+3;
title = new menutitle(X, Y-ht-dy, Wtitle, ht, t); title = new menutitle(tx, ty-ht-dy, Wtitle, ht, t);
} else } else
title = 0; title = 0;
} }