summaryrefslogtreecommitdiff
path: root/src/Fl_Pack.cxx
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2003-05-16 18:43:40 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2003-05-16 18:43:40 +0000
commit180e2985377981d5d8ac2f668f371ab841bbfca2 (patch)
tree39500c5290b55c6a0d3837aacacac23079bf42de /src/Fl_Pack.cxx
parentdece8522f0dd67fb343df472a39a222b265e65f2 (diff)
Fl_Pack ignored box() and cleared unused areas to color().
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2980 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Pack.cxx')
-rw-r--r--src/Fl_Pack.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Fl_Pack.cxx b/src/Fl_Pack.cxx
index 26e897658..dd9553246 100644
--- a/src/Fl_Pack.cxx
+++ b/src/Fl_Pack.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Pack.cxx,v 1.6.2.4.2.4 2003/01/30 21:42:25 easysw Exp $"
+// "$Id: Fl_Pack.cxx,v 1.6.2.4.2.5 2003/05/16 18:43:40 easysw Exp $"
//
// Packing widget for the Fast Light Tool Kit (FLTK).
//
@@ -90,7 +90,7 @@ void Fl_Pack::draw() {
else
H = th - rh;
}
- if (spacing_ && current_position>maximum_position &&
+ if (spacing_ && current_position>maximum_position && box() &&
(X != o->x() || Y != o->y() || d&FL_DAMAGE_ALL)) {
fl_color(color());
if (horizontal())
@@ -112,13 +112,13 @@ void Fl_Pack::draw() {
}
if (horizontal()) {
- if (maximum_position < tx+tw) {
+ if (maximum_position < tx+tw && box()) {
fl_color(color());
fl_rectf(maximum_position, ty, tx+tw-maximum_position, th);
}
tw = maximum_position-tx;
} else {
- if (maximum_position < ty+th) {
+ if (maximum_position < ty+th && box()) {
fl_color(color());
fl_rectf(tx, maximum_position, tw, ty+th-maximum_position);
}
@@ -132,5 +132,5 @@ void Fl_Pack::draw() {
}
//
-// End of "$Id: Fl_Pack.cxx,v 1.6.2.4.2.4 2003/01/30 21:42:25 easysw Exp $".
+// End of "$Id: Fl_Pack.cxx,v 1.6.2.4.2.5 2003/05/16 18:43:40 easysw Exp $".
//