mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert Fl_Group::array_ to union to better represent its behavior

Browse Source 
Amended by Albrecht:

- rename union member variables as discussed
- add comments to new array_ union members

Fixes #96

Signed-off-by: Albrecht Schlosser <albrechts.fltk@online.de>
This commit is contained in:
Robert Schumacher 2020-07-08 18:07:50 -07:00 committed by Albrecht Schlosser
parent 2b88ce521d
commit 8d5eed3c82
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
FL/Fl_Group.H
View File

@ -41,7 +41,10 @@ class Fl_Rect;
*/
class FL_EXPORT Fl_Group : public Fl_Widget {
Fl_Widget** array_;
union {
Fl_Widget** array_; // used if group has two or more children or NULL
Fl_Widget* child1_; // used if group has one child or NULL
};
Fl_Widget* savedfocus_;
Fl_Widget* resizable_;
int children_;

8
src/Fl_Group.cxx
View File

@ -38,7 +38,7 @@ Fl_Group* Fl_Group::current_;
is added or removed.
*/
Fl_Widget*const* Fl_Group::array() const {
return children_ <= 1 ? (Fl_Widget**)(&array_) : array_;
return children_ <= 1 ? &child1_ : array_;
}
/**
@ -473,9 +473,9 @@ void Fl_Group::insert(Fl_Widget &o, int index) {
}
o.parent_ = this;
if (children_ == 0) { // use array pointer to point at single child
array_ = (Fl_Widget**)&o;
child1_ = &o;
} else if (children_ == 1) { // go from 1 to 2 children
Fl_Widget* t = (Fl_Widget*)array_;
Fl_Widget* t = child1_;
array_ = (Fl_Widget**)malloc(2*sizeof(Fl_Widget*));
if (index) {array_[0] = t; array_[1] = &o;}
else {array_[0] = &o; array_[1] = t;}
@ -520,7 +520,7 @@ void Fl_Group::remove(int index) {
if (children_ == 1) { // go from 2 to 1 child
Fl_Widget *t = array_[!index];
free((void*)array_);
array_ = (Fl_Widget**)t;
child1_ = t;
} else if (children_ > 1) { // delete from array
for (; index < children_; index++) array_[index] = array_[index+1];
}