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

STR 1745: in fl_ask, if the rightmost button has a shortcut in its label, the default 'Escape' is overridden.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5981 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher 2007-11-19 16:21:19 +00:00
parent ba396b3ea4
commit d2242d59ef
3 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Fl_Pack.cxx
View File

@ -54,20 +54,20 @@ void Fl_Pack::draw() {
if (horizontal()) {
rw = -spacing_;
rh = th;
for (int i = children(); i--;)
if (child(i)->visible()) {
if (child(i) != this->resizable()) rw += child(i)->w();
rw += spacing_;
if (child(i) != this->resizable()) rw += child(i)->w();
rw += spacing_;
}
} else {
rw = tw;
rh = -spacing_;
for (int i = children(); i--;)
if (child(i)->visible()) {
if (child(i) != this->resizable()) rh += child(i)->h();
rh += spacing_;
if (child(i) != this->resizable()) rh += child(i)->h();
rh += spacing_;
}
}
for (int i = children(); i--;) {
@ -87,18 +87,18 @@ void Fl_Pack::draw() {
}
// Last child, if resizable, takes all remaining room
if(i == 0 && o == this->resizable()) {
if(horizontal())
W = tw - rw;
else
H = th - rh;
if(horizontal())
W = tw - rw;
else
H = th - rh;
}
if (spacing_ && current_position>maximum_position && box() &&
(X != o->x() || Y != o->y() || d&FL_DAMAGE_ALL)) {
(X != o->x() || Y != o->y() || d&FL_DAMAGE_ALL)) {
fl_color(color());
if (horizontal())
fl_rectf(maximum_position, ty, spacing_, th);
fl_rectf(maximum_position, ty, spacing_, th);
else
fl_rectf(tx, maximum_position, tw, spacing_);
fl_rectf(tx, maximum_position, tw, spacing_);
}
if (X != o->x() || Y != o->y() || W != o->w() || H != o->h()) {
o->resize(X,Y,W,H);
@ -115,7 +115,7 @@ void Fl_Pack::draw() {
current_position += spacing_;
}
}
if (horizontal()) {
if (maximum_position < tx+tw && box()) {
fl_color(color());
@ -129,7 +129,7 @@ void Fl_Pack::draw() {
}
th = maximum_position-ty;
}
tw += Fl::box_dw(box()); if (tw <= 0) tw = 1;
th += Fl::box_dh(box()); if (th <= 0) th = 1;
if (tw != w() || th != h()) {

5
src/fl_ask.cxx
View File

@ -202,6 +202,11 @@ static int innards(const char* fmt, va_list ap,
if (button[1]->visible() && !input->visible())
button[1]->take_focus();
message_form->hotspot(button[0]);
if (b0 && Fl_Widget::label_shortcut(b0))
button[0]->shortcut(0);
else
button[0]->shortcut(FL_Escape);
message_form->show();
int r;
for (;;) {

25
src/fl_shortcut.cxx
View File

@ -207,19 +207,28 @@ int fl_old_shortcut(const char* s) {
// Tests for &x shortcuts in button labels:
int Fl_Widget::test_shortcut(const char *l) {
char c = Fl::event_text()[0];
if (!c || !l) return 0;
char Fl_Widget::label_shortcut(const char *t) {
if (!t) return 0;
for (;;) {
if (!*l) return 0;
if (*l++ == '&' && *l) {
if (*l == '&') l++;
else if (*l == c) return 1;
else return 0;
if (*t==0) return 0;
if (*t=='&') {
char s = t[1];
if (s==0) return 0;
else if (s=='&') t++;
else return s;
}
t++;
}
}
int Fl_Widget::test_shortcut(const char *t) {
char c = Fl::event_text()[0];
if (!c || !t) return 0;
if (c == label_shortcut(t))
return 1;
return 0;
}
int Fl_Widget::test_shortcut() {
if (!(flags()&SHORTCUT_LABEL)) return 0;
return test_shortcut(label());