diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | fluid/Fl_Group_Type.cxx | 16 | ||||
| -rw-r--r-- | fluid/Fl_Type.h | 1 |
3 files changed, 18 insertions, 0 deletions
@@ -1,5 +1,6 @@ CHANGES IN FLTK 1.1.8 + - Fixed Scroll crash in Fluid Live Mode (STR #1524) - Fixed mousewheel event propagation (STR #1521) - Fixed drawing issues of a tile in a scroll (STR #1507) - Fixed dismissing buttons in menu bars (STR #1494) diff --git a/fluid/Fl_Group_Type.cxx b/fluid/Fl_Group_Type.cxx index 9dda8b5a3..3e6c8e3d6 100644 --- a/fluid/Fl_Group_Type.cxx +++ b/fluid/Fl_Group_Type.cxx @@ -278,6 +278,22 @@ void Fl_Group_Type::copy_properties() { const char scroll_type_name[] = "Fl_Scroll"; +Fl_Widget *Fl_Scroll_Type::enter_live_mode(int top) { + Fl_Group *grp = new Fl_Scroll(o->x(), o->y(), o->w(), o->h()); + grp->show(); + live_widget = grp; + if (live_widget) { + copy_properties(); + Fl_Type *n; + for (n = next; n && n->level > level; n = n->next) { + if (n->level == level+1) + n->enter_live_mode(); + } + grp->end(); + } + return live_widget; +} + Fl_Menu_Item scroll_type_menu[] = { {"BOTH", 0, 0, 0/*(void*)Fl_Scroll::BOTH*/}, {"HORIZONTAL", 0, 0, (void*)Fl_Scroll::HORIZONTAL}, diff --git a/fluid/Fl_Type.h b/fluid/Fl_Type.h index 21ee85f5b..f5a18d831 100644 --- a/fluid/Fl_Type.h +++ b/fluid/Fl_Type.h @@ -441,6 +441,7 @@ public: virtual const char *type_name() {return scroll_type_name;} Fl_Widget_Type *_make() {return new Fl_Scroll_Type();} int pixmapID() { return 19; } + Fl_Widget *enter_live_mode(int top=0); void copy_properties(); }; |