mirror of https://github.com/fltk/fltk
Fixed Scroll crash in Fluid Live Mode (STR #1524)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5609 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
parent
01af5901b0
commit
504ba253d4
1
CHANGES
1
CHANGES
|
@ -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)
|
||||
|
|
|
@ -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},
|
||||
|
|
|
@ -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();
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue