mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master'

Browse Source
This commit is contained in:
ManoloFLTK 2020-03-28 07:13:34 +01:00
commit f4029aebde
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FL/Fl_Choice.H
View File

@ -112,7 +112,7 @@ public:
/**
Gets the index of the last item chosen by the user.
The index is zero initially.
The index is -1 initially.
*/
int value() const {return Fl_Menu_::value();}

4
documentation/src/osissues.dox
View File

@ -474,7 +474,7 @@ the class "fltk" is used (e.g. <tt>fltk.background</tt>). If no
match is found, a global search is done (e.g.
<tt>*background</tt>).
\subsection osissues_x_scaling Dislay Scaling Factor
\subsection osissues_x_scaling Display Scaling Factor
FLTK uses the value of the Xft.dpi resource divided by 96.
to initialize the display scaling factor. That is also
@ -583,7 +583,7 @@ DrawSomething(fl_gc, ..., fl_brush());
It may also be useful to refer to Fl_Window::current()
to get the window's size or position.
\subsection osissues_windows_scaling Dislay Scaling Factor
\subsection osissues_windows_scaling Display Scaling Factor
FLTK uses the value given by function GetDpiForMonitor() divided by 96.
to initialize the scaling factor of each display in the system.

23
src/Fl_Menu.cxx
View File

@ -857,20 +857,23 @@ int menuwindow::handle_part1(int e) {
}
/**
Pulldown() is similar to popup(), but a rectangle is
provided to position the menu. The menu is made at least W
wide, and the picked item is centered over the rectangle
(like Fl_Choice uses). If picked is zero or not
found, the menu is aligned just below the rectangle (like a pulldown
menu).
<P>The title and menubar arguments are used
internally by the Fl_Menu_Bar widget.
Pulldown() is similar to popup(), but a rectangle is provided
to position the menu.
The menu is made at least \p W wide, and the picked item \p initial_item
is centered over the rectangle (like Fl_Choice uses).
If \p initial_item is \p NULL or not found, the menu is aligned just
below the rectangle (like a pulldown menu).
The \p title and \p menubar arguments are used internally by the
Fl_Menu_Bar widget.
*/
const Fl_Menu_Item* Fl_Menu_Item::pulldown(
int X, int Y, int W, int H,
const Fl_Menu_Item* initial_item,
const Fl_Menu_* pbutton,
const Fl_Menu_Item* t,
const Fl_Menu_Item* title,
int menubar) const {
Fl_Group::current(0); // fix possible user error...
@ -888,7 +891,7 @@ const Fl_Menu_Item* Fl_Menu_Item::pulldown(
X += Fl::event_x_root()-Fl::event_x();
Y += Fl::event_y_root()-Fl::event_y();
}
menuwindow mw(this, X, Y, W, H, initial_item, t, menubar);
menuwindow mw(this, X, Y, W, H, initial_item, title, menubar);
Fl::grab(mw);
menustate pp; p = &pp;
pp.p[0] = &mw;

2
src/Fl_visual.cxx
View File

@ -52,7 +52,7 @@
</UL>
<P>This returns true if the system has the capabilities by default or
FLTK suceeded in turing them on. Your program will still work even if
FLTK succeeded in turning them on. Your program will still work even if
this returns false (it just won't look as good).
*/
int Fl::visual(int flags)