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

Make paste logic smarter for int and float fields.

Browse Source 
Replace existing text when pasting into an int or float input field.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1691 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2001-11-17 17:00:22 +00:00
parent 45658d7c0f
commit e5db11fd43
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -7,7 +7,8 @@ CHANGES IN FLTK 1.1.0b6
notifications of various types.
- Fl_Float_Input and Fl_Int_Input no longer accept
pasted text that is not a floating point or integer
value.
value. Pasted numbers now replace text in these
widgets.
- Implemented the Fl_File_Icon::load_png() method.
- The Fl_File_Icon::load_system_icons() method now
supports KDE 2.x icons.

30
src/Fl_Input_.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Input_.cxx,v 1.21.2.11.2.3 2001/11/17 16:37:48 easysw Exp $"
// "$Id: Fl_Input_.cxx,v 1.21.2.11.2.4 2001/11/17 17:00:22 easysw Exp $"
//
// Common input widget routines for the Fast Light Tool Kit (FLTK).
//
@ -715,21 +715,37 @@ int Fl_Input_::handletext(int event, int X, int Y, int W, int H) {
const char* e = t+Fl::event_length();
if (type() != FL_MULTILINE_INPUT) while (e > t && isspace(*(e-1))) e--;
if (type() == FL_INT_INPUT) {
while (isspace(*t) && t < e) t ++;
const char *p = t;
while ((isdigit(*p) || *p == '+' || *p == '-') && p < e)
p ++;
if (*p == '+' || *p == '-') p ++;
if (strncmp(p, "0x", 2) == 0) {
p += 2;
while (isxdigit(*p) && p < e) p ++;
} else {
while (isdigit(*p) && p < e) p ++;
}
if (p < e) {
fl_beep(FL_BEEP_ERROR);
return 1;
}
} else return replace(0, size(), t, e - t);
} else if (type() == FL_FLOAT_INPUT) {
while (isspace(*t) && t < e) t ++;
const char *p = t;
while ((isdigit(*p) || *p == '+' || *p == '-' || *p == '.') && p < e)
if (*p == '+' || *p == '-') p ++;
while (isdigit(*p) && p < e) p ++;
if (*p == '.') {
p ++;
while (isdigit(*p) && p < e) p ++;
if (*p == 'e' || *p == 'E') {
p ++;
if (*p == '+' || *p == '-') p ++;
while (isdigit(*p) && p < e) p ++;
}
}
if (p < e) {
fl_beep(FL_BEEP_ERROR);
return 1;
}
} else return replace(0, size(), t, e - t);
}
return replace(position(), mark(), t, e-t);}
@ -839,5 +855,5 @@ Fl_Input_::~Fl_Input_() {
}
//
// End of "$Id: Fl_Input_.cxx,v 1.21.2.11.2.3 2001/11/17 16:37:48 easysw Exp $".
// End of "$Id: Fl_Input_.cxx,v 1.21.2.11.2.4 2001/11/17 17:00:22 easysw Exp $".
//