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

STR #86: Swapped menu shortcut labels for OS X

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3050 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
2003-07-18 17:43:30 +00:00
parent 4042047358
commit c0bb3a7465
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+1
View File
@@ -1,5 +1,6 @@
CHANGES IN FLTK 1.1.4 CHANGES IN FLTK 1.1.4
- 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)
- Updated documentatiopn of fl_draw (STR #94) - Updated documentatiopn of fl_draw (STR #94)
fluid/Fl_Type.cxx
+3 -3
View File
@@ -1,5 +1,5 @@
// //
// "$Id: Fl_Type.cxx,v 1.6.2.6.2.15 2003/07/18 03:49:58 matthiaswm Exp $" // "$Id: Fl_Type.cxx,v 1.6.2.6.2.16 2003/07/18 17:43:30 matthiaswm Exp $"
// //
// Widget type code for the Fast Light Tool Kit (FLTK). // Widget type code for the Fast Light Tool Kit (FLTK).
// //
@@ -370,7 +370,7 @@ int Widget_Browser::handle(int e) {
if (!title) break; if (!title) break;
l = (Fl_Type*)find_item(Fl::event_y()); l = (Fl_Type*)find_item(Fl::event_y());
if (l) { if (l) {
X += 10*l->level; X += 12*l->level + 18 - hposition();
if (l->is_parent() && Fl::event_x()>X && Fl::event_x()<X+13) ; if (l->is_parent() && Fl::event_x()>X && Fl::event_x()<X+13) ;
else l = 0; else l = 0;
} }
@@ -791,5 +791,5 @@ void Fl_Type::read_property(const char *c) {
int Fl_Type::read_fdesign(const char*, const char*) {return 0;} int Fl_Type::read_fdesign(const char*, const char*) {return 0;}
// //
// End of "$Id: Fl_Type.cxx,v 1.6.2.6.2.15 2003/07/18 03:49:58 matthiaswm Exp $". // End of "$Id: Fl_Type.cxx,v 1.6.2.6.2.16 2003/07/18 17:43:30 matthiaswm Exp $".
// //
src/fl_shortcut.cxx
+5 -5
View File
@@ -1,5 +1,5 @@
// //
// "$Id: fl_shortcut.cxx,v 1.4.2.9.2.11 2003/06/12 01:36:18 easysw Exp $" // "$Id: fl_shortcut.cxx,v 1.4.2.9.2.12 2003/07/18 17:43:30 matthiaswm Exp $"
// //
// Shortcut support routines for the Fast Light Tool Kit (FLTK). // Shortcut support routines for the Fast Light Tool Kit (FLTK).
// //
@@ -119,9 +119,9 @@ const char * fl_shortcut_label(int shortcut) {
#ifdef __APPLE__ #ifdef __APPLE__
// \todo Mac : we might want to change the symbols for Mac users - consider drawing Apple Symbols... . // \todo Mac : we might want to change the symbols for Mac users - consider drawing Apple Symbols... .
if (shortcut & FL_SHIFT) {strcpy(p,"Shift+"); p += 6;} //: Mac hollow up arrow if (shortcut & FL_SHIFT) {strcpy(p,"Shift+"); p += 6;} //: Mac hollow up arrow
if (shortcut & FL_META) {strcpy(p,"Ctrl+"); p += 5;} //: Mac 'control' if (shortcut & FL_META) {strcpy(p,"Cmd+"); p += 4;} //: Mac 'Apple' key
if (shortcut & FL_ALT) {strcpy(p,"Option+"); p += 7;} //: Mac 'Option' or fancy switch symbol if (shortcut & FL_ALT) {strcpy(p,"Option+"); p += 7;} //: Mac 'Alt/Option' or fancy switch symbol
if (shortcut & FL_CTRL) {strcpy(p,"Cmd+"); p += 4;} //: Mac Apple or Curlyflour if (shortcut & FL_CTRL) {strcpy(p,"Ctrl+"); p += 5;} //: Mac ctrl key
#else #else
if (shortcut & FL_META) {strcpy(p,"Meta+"); p += 5;} if (shortcut & FL_META) {strcpy(p,"Meta+"); p += 5;}
if (shortcut & FL_ALT) {strcpy(p,"Alt+"); p += 4;} if (shortcut & FL_ALT) {strcpy(p,"Alt+"); p += 4;}
@@ -201,5 +201,5 @@ int Fl_Widget::test_shortcut() {
} }
// //
// End of "$Id: fl_shortcut.cxx,v 1.4.2.9.2.11 2003/06/12 01:36:18 easysw Exp $". // End of "$Id: fl_shortcut.cxx,v 1.4.2.9.2.12 2003/07/18 17:43:30 matthiaswm Exp $".
// //