From 7fdbfc61bee6b6a22c6c24fbd80a79cf08cdd51e Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Tue, 6 Apr 2004 17:38:36 +0000 Subject: More doco updates. FLUID's Layout->Center In Group functionality did not properly handle widgets that were children of a Fl_Window widget (STR #318) The Fl_Text_Display destructor did not remove the predelete callback associated with the current buffer (STR #332) Fixed several bugs in the MacOS X Fl::add_fd() handling (STR #333, STR #337) The Fl_Text_Display widget did not display selections set by the application (STR #322) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3299 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- fluid/align_widget.cxx | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'fluid') diff --git a/fluid/align_widget.cxx b/fluid/align_widget.cxx index 6f90424e5..ad5544610 100644 --- a/fluid/align_widget.cxx +++ b/fluid/align_widget.cxx @@ -1,5 +1,5 @@ // -// "$Id: align_widget.cxx,v 1.1.2.4 2004/04/06 02:47:25 easysw Exp $" +// "$Id: align_widget.cxx,v 1.1.2.5 2004/04/06 17:38:36 easysw Exp $" // // alignment code for the Fast Light Tool Kit (FLTK). // @@ -303,7 +303,10 @@ void align_widget_cb(Fl_Widget*, long how) { Fl_Widget *w = ((Fl_Widget_Type *)o)->o; Fl_Widget *p = ((Fl_Widget_Type *)o->parent)->o; - int center2 = 2*p->x()+p->w(); + int center2; + + if (w->window() == p) center2 = p->w(); + else center2 = 2*p->x()+p->w(); w->resize((center2-w->w())/2, w->y(), w->w(), w->h()); w->redraw(); if (w->window()) w->window()->redraw(); @@ -315,7 +318,10 @@ void align_widget_cb(Fl_Widget*, long how) { Fl_Widget *w = ((Fl_Widget_Type *)o)->o; Fl_Widget *p = ((Fl_Widget_Type *)o->parent)->o; - int center2 = 2*p->y()+p->h(); + int center2; + + if (w->window() == p) center2 = p->h(); + else center2 = 2*p->y()+p->h(); w->resize(w->x(), (center2-w->h())/2, w->w(), w->h()); w->redraw(); if (w->window()) w->window()->redraw(); @@ -326,6 +332,6 @@ void align_widget_cb(Fl_Widget*, long how) // -// End of "$Id: align_widget.cxx,v 1.1.2.4 2004/04/06 02:47:25 easysw Exp $". +// End of "$Id: align_widget.cxx,v 1.1.2.5 2004/04/06 17:38:36 easysw Exp $". // -- cgit v1.2.3