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

Changes in menuitem font's would only be recognized if the

Browse Source 
fontheight was != 0. Fixed to change fonts, but keep height.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3051 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
2003-07-18 22:36:00 +00:00
parent c0bb3a7465
commit 9cdf63cc40
2 changed files with 7 additions and 5 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.4 CHANGES IN FLTK 1.1.4
- Menuitem now changes font, even if fontsize
is not set (STR #110)
- Swapped shortcut labels in OS X (STR #86) - Swapped shortcut labels in OS X (STR #86)
- Non-square Fl_Dial would calculate angle from user - Non-square Fl_Dial would calculate angle from user
input wrong (STR #101) input wrong (STR #101)
src/Fl_Menu.cxx
+5 -5
View File
@@ -1,5 +1,5 @@
// //
// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.26 2003/05/21 01:50:13 easysw Exp $" // "$Id: Fl_Menu.cxx,v 1.18.2.12.2.27 2003/07/18 22:36:00 matthiaswm Exp $"
// //
// Menu code for the Fast Light Tool Kit (FLTK). // Menu code for the Fast Light Tool Kit (FLTK).
// //
@@ -113,7 +113,7 @@ int Fl_Menu_Item::measure(int* hp, const Fl_Menu_* m) const {
l.image = 0; l.image = 0;
l.deimage = 0; l.deimage = 0;
l.type = labeltype_; l.type = labeltype_;
l.font = labelsize_ ? labelfont_ : uchar(m ? m->textfont() : FL_HELVETICA); l.font = labelsize_ || labelfont_ ? labelfont_ : uchar(m ? m->textfont() : FL_HELVETICA);
l.size = labelsize_ ? labelsize_ : m ? m->textsize() : (uchar)FL_NORMAL_SIZE; l.size = labelsize_ ? labelsize_ : m ? m->textsize() : (uchar)FL_NORMAL_SIZE;
l.color = FL_BLACK; // this makes no difference? l.color = FL_BLACK; // this makes no difference?
fl_draw_shortcut = 1; fl_draw_shortcut = 1;
@@ -130,7 +130,7 @@ void Fl_Menu_Item::draw(int x, int y, int w, int h, const Fl_Menu_* m,
l.image = 0; l.image = 0;
l.deimage = 0; l.deimage = 0;
l.type = labeltype_; l.type = labeltype_;
l.font = labelsize_ ? labelfont_ : uchar(m ? m->textfont() : FL_HELVETICA); l.font = labelsize_ || labelfont_ ? labelfont_ : uchar(m ? m->textfont() : FL_HELVETICA);
l.size = labelsize_ ? labelsize_ : m ? m->textsize() : (uchar)FL_NORMAL_SIZE; l.size = labelsize_ ? labelsize_ : m ? m->textsize() : (uchar)FL_NORMAL_SIZE;
l.color = labelcolor_ ? labelcolor_ : m ? m->textcolor() : int(FL_BLACK); l.color = labelcolor_ ? labelcolor_ : m ? m->textcolor() : int(FL_BLACK);
if (!active()) l.color = fl_inactive((Fl_Color)l.color); if (!active()) l.color = fl_inactive((Fl_Color)l.color);
@@ -360,7 +360,7 @@ void menuwindow::drawentry(const Fl_Menu_Item* m, int n, int eraseit) {
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, y1+sz/2);
} else if (m->shortcut_) { } else if (m->shortcut_) {
Fl_Font f = 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;
fl_font(f, m->labelsize_ ? m->labelsize_ : fl_font(f, m->labelsize_ ? m->labelsize_ :
button ? button->textsize() : FL_NORMAL_SIZE); button ? button->textsize() : FL_NORMAL_SIZE);
@@ -793,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.26 2003/05/21 01:50:13 easysw Exp $". // End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.27 2003/07/18 22:36:00 matthiaswm Exp $".
// //