Author: AlbrechtS
Date: 2009-09-13 05:10:56 -0700 (Sun, 13 Sep 2009)
New Revision: 6868
Log:
reverted Fl_Pack changes (STR #2130), because they were wrong. The current
implementation of Fl_Pack doesn't know the bounding box of the children in
advance and thus can't clip its children.
Modified:
branches/branch-1.1/CHANGES
branches/branch-1.1/src/Fl_Pack.cxx
Modified: branches/branch-1.1/CHANGES
===================================================================
--- branches/branch-1.1/CHANGES 2009-09-13 11:41:16 UTC (rev 6867)
+++ branches/branch-1.1/CHANGES 2009-09-13 12:10:56 UTC (rev 6868)
@@ -1,6 +1,5 @@
CHANGES IN FLTK 1.1.10
- - Fl_Pack didn't obey clip_children() (STR #2130)
- Updated mirror sites in documentation (STR #2220)
- Setting a default font for Xft (STR #2216)
- Temporarily limited builds to 32-bit on OX S to stay
Modified: branches/branch-1.1/src/Fl_Pack.cxx
===================================================================
--- branches/branch-1.1/src/Fl_Pack.cxx 2009-09-13 11:41:16 UTC (rev 6867)
+++ branches/branch-1.1/src/Fl_Pack.cxx 2009-09-13 12:10:56 UTC (rev 6868)
@@ -70,9 +70,6 @@
rh += spacing_;
}
}
-
- if (clip_children()) fl_push_clip(tx,ty,tw,th);
-
for (int i = children(); i--;) {
Fl_Widget* o = *a++;
if (o->visible()) {
@@ -118,9 +115,7 @@
current_position += spacing_;
}
}
-
- if (clip_children()) fl_pop_clip();
-
+
if (horizontal()) {
if (maximum_position < tx+tw && box()) {
fl_color(color());
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
