diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 1998-11-18 18:40:44 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 1998-11-18 18:40:44 +0000 |
| commit | 1ae8964fc9621e0f638adfde0334b59853fde2b5 (patch) | |
| tree | c326459c954fc779a3f558206437007b04ecccb7 | |
| parent | ed4cdc51daae6d1d50f87892f552874e0fbdfa1f (diff) | |
Tab resize bug fix from Gustavo.
git-svn-id: file:///fltk/svn/fltk/trunk@96 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | fluid/Fl_Window_Type.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/fluid/Fl_Window_Type.cxx b/fluid/Fl_Window_Type.cxx index 0798f5c74..bf19200e2 100644 --- a/fluid/Fl_Window_Type.cxx +++ b/fluid/Fl_Window_Type.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Window_Type.cxx,v 1.7 1998/11/05 16:04:44 mike Exp $" +// "$Id: Fl_Window_Type.cxx,v 1.8 1998/11/18 18:40:44 mike Exp $" // // Window type code for the Fast Light Tool Kit (FLTK). // @@ -475,6 +475,18 @@ int Fl_Window_Type::handle(int event) { if (Fl::event_inside(o->o)) selection = o; CONTINUE2:; }} + // see if user grabs edges of selected region: + if (numselected && !overlays_invisible && !(Fl::event_state(FL_SHIFT)) && + mx<=br+snap && mx>=bx-snap && my<=bt+snap && my>=by-snap) { + int snap1 = snap>5 ? snap : 5; + int w1 = (br-bx)/4; if (w1 > snap1) w1 = snap1; + if (mx>=br-w1) drag |= RIGHT; + else if (mx<bx+w1) drag |= LEFT; + w1 = (bt-by)/4; if (w1 > snap1) w1 = snap1; + if (my<=by+w1) drag |= BOTTOM; + else if (my>bt-w1) drag |= TOP; + if (!drag) drag = DRAG; + } // do object-specific selection of other objects: {Fl_Type* t = selection->click_test(mx, my); if (t) { @@ -488,22 +500,10 @@ int Fl_Window_Type::handle(int event) { if (t->is_menu_item()) t->open(); } selection = t; - return 1; - }} - // see if user grabs edges of selected region: - if (numselected && !overlays_invisible && !(Fl::event_state(FL_SHIFT)) && - mx<=br+snap && mx>=bx-snap && my<=bt+snap && my>=by-snap) { - int snap1 = snap>5 ? snap : 5; - int w1 = (br-bx)/4; if (w1 > snap1) w1 = snap1; - if (mx>=br-w1) drag |= RIGHT; - else if (mx<bx+w1) drag |= LEFT; - w1 = (bt-by)/4; if (w1 > snap1) w1 = snap1; - if (my<=by+w1) drag |= BOTTOM; - else if (my>bt-w1) drag |= TOP; - if (!drag) drag = DRAG; + drag = 0; } else { - drag = BOX; // start a new selection region - } + if (!drag) drag = BOX; // if all else fails, start a new selection region + }} return 1; case FL_DRAG: if (!drag) return 0; @@ -693,5 +693,5 @@ int Fl_Window_Type::read_fdesign(const char* name, const char* value) { } // -// End of "$Id: Fl_Window_Type.cxx,v 1.7 1998/11/05 16:04:44 mike Exp $". +// End of "$Id: Fl_Window_Type.cxx,v 1.8 1998/11/18 18:40:44 mike Exp $". // |