Author: AlbrechtS
Date: 2009-09-13 04:41:16 -0700 (Sun, 13 Sep 2009)
New Revision: 6867
Log:
Fl_Pack didn't obey clip_children() (STR #2130).
This doesn't solve the OP's problem, but is useful, although Fl_Pack
resizes to surround its children anyway. I'm thinking of outside labels
here, that might else be drawn outside the Fl_Pack area.
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 10:57:38 UTC (rev 6866)
+++ branches/branch-1.1/CHANGES 2009-09-13 11:41:16 UTC (rev 6867)
@@ -1,5 +1,6 @@
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 10:57:38 UTC (rev 6866)
+++ branches/branch-1.1/src/Fl_Pack.cxx 2009-09-13 11:41:16 UTC (rev 6867)
@@ -70,6 +70,9 @@
rh += spacing_;
}
}
+
+ if (clip_children()) fl_push_clip(tx,ty,tw,th);
+
for (int i = children(); i--;) {
Fl_Widget* o = *a++;
if (o->visible()) {
@@ -115,7 +118,9 @@
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
