Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-21 06:21:26 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fl_Pack ignored box() and cleared unused areas to color().

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2980 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
2003-05-16 18:43:40 +00:00
parent dece8522f0
commit 180e298537
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+3
View File
@@ -1,5 +1,8 @@
CHANGES IN FLTK 1.1.4
- Fl_Pack ignored the box() setting and cleared any
unused areas to the widget color; it now only does so
if the box() is set to something other than FL_NO_BOX.
- Updated the Fl_Tabs widget to offset the first tab by
the box dx value to avoid visual errors.
- Updated the plastic up box to draw only a single
src/Fl_Pack.cxx
+5 -5
View File
@@ -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 $".
//