diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Tooltip.cxx | 17 | ||||
| -rw-r--r-- | src/Fl_x.cxx | 12 |
2 files changed, 17 insertions, 12 deletions
diff --git a/src/Fl_Tooltip.cxx b/src/Fl_Tooltip.cxx index 929f90ca9..5baabf8da 100644 --- a/src/Fl_Tooltip.cxx +++ b/src/Fl_Tooltip.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Tooltip.cxx,v 1.38.2.2 2001/08/02 15:31:59 easysw Exp $" +// "$Id: Fl_Tooltip.cxx,v 1.38.2.3 2001/10/18 18:53:20 easysw Exp $" // // Tooltip source file for the Fast Light Tool Kit (FLTK). // @@ -42,7 +42,9 @@ Fl_TooltipBox *Fl_Tooltip::box = 0; Fl_Menu_Window *Fl_Tooltip::window = 0; Fl_Widget *Fl_Tooltip::widget = 0; int Fl_Tooltip::shown = 0; -uchar Fl_Tooltip::color_ = FL_YELLOW; +uchar Fl_Tooltip::color_ = fl_color_cube(FL_NUM_RED - 1, + FL_NUM_GREEN - 1, + FL_NUM_BLUE - 2); int Fl_Tooltip::font_ = FL_HELVETICA; int Fl_Tooltip::size_ = FL_NORMAL_SIZE; @@ -88,11 +90,9 @@ public: fl_measure(Fl_Tooltip::widget->tooltip(), ww, hh); label(Fl_Tooltip::widget->tooltip()); - int ox = - widgetWindow->x_root() + Fl_Tooltip::widget->x() + Fl_Tooltip::widget->w()/2; - int oy = - widgetWindow->y_root() + Fl_Tooltip::widget->y() + Fl_Tooltip::widget->h() + 10; - + int ox = Fl::event_x_root() + 10; + int oy = Fl::event_y_root() + 10; + if (ox >= Fl::w()) ox = Fl::w() - ww - 6; if (oy >= Fl::h()) @@ -156,6 +156,7 @@ Fl_Tooltip::tooltip_timeout(void *v) { window = new Fl_Menu_Window(0, 0, 10, 10, 0); window->clear_border(); window->box(FL_NO_BOX); + window->set_override(); window->begin(); box = new Fl_TooltipBox; @@ -188,5 +189,5 @@ Fl_Tooltip::tooltip_timeout(void *v) { // -// End of "$Id: Fl_Tooltip.cxx,v 1.38.2.2 2001/08/02 15:31:59 easysw Exp $". +// End of "$Id: Fl_Tooltip.cxx,v 1.38.2.3 2001/10/18 18:53:20 easysw Exp $". // diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index f97f8575e..900d08428 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_x.cxx,v 1.24.2.24.2.2 2001/08/02 21:11:43 easysw Exp $" +// "$Id: Fl_x.cxx,v 1.24.2.24.2.3 2001/10/18 18:53:20 easysw Exp $" // // X specific code for the Fast Light Tool Kit (FLTK). // @@ -702,7 +702,11 @@ void Fl_X::make_xid(Fl_Window* w, XVisualInfo *visual, Colormap colormap) attr.colormap = colormap; attr.border_pixel = 0; attr.bit_gravity = 0; // StaticGravity; - attr.override_redirect = 0; + if (w->override()) { + attr.override_redirect = 1; + attr.save_under = 1; + mask |= CWOverrideRedirect | CWSaveUnder; + } else attr.override_redirect = 0; if (Fl::grab()) { attr.save_under = 1; mask |= CWSaveUnder; if (!w->border()) {attr.override_redirect = 1; mask |= CWOverrideRedirect;} @@ -786,7 +790,7 @@ void Fl_X::make_xid(Fl_Window* w, XVisualInfo *visual, Colormap colormap) // Send X window stuff that can be changed over time: void Fl_X::sendxjunk() { - if (w->parent()) return; // it's not a window manager window! + if (w->parent() || w->override()) return; // it's not a window manager window! if (!w->size_range_set) { // default size_range based on resizable(): if (w->resizable()) { @@ -927,5 +931,5 @@ void Fl_Window::make_current() { #endif // -// End of "$Id: Fl_x.cxx,v 1.24.2.24.2.2 2001/08/02 21:11:43 easysw Exp $". +// End of "$Id: Fl_x.cxx,v 1.24.2.24.2.3 2001/10/18 18:53:20 easysw Exp $". // |