diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-05-21 01:50:14 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-05-21 01:50:14 +0000 |
| commit | 340e84839e9a2b2d29c87e4f7f098a1cf7f370a8 (patch) | |
| tree | ab3c047d2cfaf3ab7a30247d6aae51e64cc9148d /src | |
| parent | 2c6367a0e6d8bbe3d7df248c550b37b8744f20fe (diff) | |
Fix menu item fonts (STR #30)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2991 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Menu.cxx | 10 | ||||
| -rw-r--r-- | src/fl_shortcut.cxx | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx index 2076bf10f..c9a5098da 100644 --- a/src/Fl_Menu.cxx +++ b/src/Fl_Menu.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.25 2003/05/21 01:37:17 easysw Exp $" +// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.26 2003/05/21 01:50:13 easysw Exp $" // // Menu code for the Fast Light Tool Kit (FLTK). // @@ -360,8 +360,10 @@ void menuwindow::drawentry(const Fl_Menu_Item* m, int n, int eraseit) { int x1 = xx+ww-sz-3; fl_polygon(x1, y1, x1, y1+sz, x1+sz, y1+sz/2); } else if (m->shortcut_) { - Fl_Font f = button ? button->textfont() : FL_HELVETICA; - fl_font(f, button ? button->textsize() : FL_NORMAL_SIZE); + Fl_Font f = m->labelfont_ ? (Fl_Font)m->labelfont_ : + button ? button->textfont() : FL_HELVETICA; + fl_font(f, m->labelsize_ ? m->labelsize_ : + button ? button->textsize() : FL_NORMAL_SIZE); fl_draw(fl_shortcut_label(m->shortcut_), xx, yy, ww-3, hh, FL_ALIGN_RIGHT); } @@ -791,5 +793,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const { } // -// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.25 2003/05/21 01:37:17 easysw Exp $". +// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.26 2003/05/21 01:50:13 easysw Exp $". // diff --git a/src/fl_shortcut.cxx b/src/fl_shortcut.cxx index 7f3f9b6fc..a89b554c8 100644 --- a/src/fl_shortcut.cxx +++ b/src/fl_shortcut.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_shortcut.cxx,v 1.4.2.9.2.9 2003/01/30 21:44:21 easysw Exp $" +// "$Id: fl_shortcut.cxx,v 1.4.2.9.2.10 2003/05/21 01:50:14 easysw Exp $" // // Shortcut support routines for the Fast Light Tool Kit (FLTK). // @@ -78,6 +78,7 @@ int Fl::test_shortcut(int shortcut) { // This table must be in numeric order by fltk (X) keysym number: struct Keyname {int key; const char* name;}; static Keyname table[] = { + {' ', "Space"}, {FL_BackSpace, "Backspace"}, {FL_Tab, "Tab"}, {0xff0b/*XK_Clear*/, "Clear"}, @@ -200,5 +201,5 @@ int Fl_Widget::test_shortcut() { } // -// End of "$Id: fl_shortcut.cxx,v 1.4.2.9.2.9 2003/01/30 21:44:21 easysw Exp $". +// End of "$Id: fl_shortcut.cxx,v 1.4.2.9.2.10 2003/05/21 01:50:14 easysw Exp $". // |