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

Fl_Menu now draws sub-menu arrows like other toolkits and FLTK

Browse Source 
2.0 (STR #651)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3941 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
2004-12-14 13:49:55 +00:00
parent 24a940f11d
commit f912892305
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+2
View File
@@ -1,5 +1,7 @@
CHANGES IN FLTK 1.1.7 CHANGES IN FLTK 1.1.7
- Fl_Menu now draws sub-menu arrows like other toolkits
and FLTK 2.0 (STR #651)
- Fixed a compiler warning in Fl_Window.H (STR #641) - Fixed a compiler warning in Fl_Window.H (STR #641)
- Tooltips disabled shortcut processing (STR #643) - Tooltips disabled shortcut processing (STR #643)
- Fl::event_number() didn't always match the value sent - Fl::event_number() didn't always match the value sent
src/Fl_Menu.cxx
+4 -4
View File
@@ -1,5 +1,5 @@
// //
// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.35 2004/11/23 01:48:25 matthiaswm Exp $" // "$Id: Fl_Menu.cxx,v 1.18.2.12.2.36 2004/12/14 13:49:55 easysw Exp $"
// //
// Menu code for the Fast Light Tool Kit (FLTK). // Menu code for the Fast Light Tool Kit (FLTK).
// //
@@ -393,10 +393,10 @@ void menuwindow::drawentry(const Fl_Menu_Item* m, int n, int eraseit) {
// the shortcuts and arrows assumme fl_color() was left set by draw(): // the shortcuts and arrows assumme fl_color() was left set by draw():
if (m->submenu()) { if (m->submenu()) {
int sz = (hh-5)&-2; int sz = (hh-7)&-2;
int y1 = yy+(hh-sz)/2; int y1 = yy+(hh-sz)/2;
int x1 = xx+ww-sz-3; int x1 = xx+ww-sz-3;
fl_polygon(x1, y1, x1, y1+sz, x1+sz, y1+sz/2); fl_polygon(x1, y1, x1, y1+sz, x1+sz/2, y1+sz/2);
} else if (m->shortcut_) { } else if (m->shortcut_) {
Fl_Font f = m->labelsize_ || m->labelfont_ ? (Fl_Font)m->labelfont_ : Fl_Font f = m->labelsize_ || m->labelfont_ ? (Fl_Font)m->labelfont_ :
button ? button->textfont() : FL_HELVETICA; button ? button->textfont() : FL_HELVETICA;
@@ -832,5 +832,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const {
} }
// //
// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.35 2004/11/23 01:48:25 matthiaswm Exp $". // End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.36 2004/12/14 13:49:55 easysw Exp $".
// //