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

Small fix for vertical connectors between far away items, as noted by Christophe.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9217 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Greg Ercolano 2011-12-25 17:51:50 +00:00
parent fc135a498b
commit aa0e4bb823
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Fl_Tree_Item.cxx
View File

@ -547,6 +547,8 @@ void Fl_Tree_Item::draw(int X, int &Y, int W, Fl_Widget *tree,
Fl_Tree_Item *itemfocus,
const Fl_Tree_Prefs &prefs, int lastchild) {
if ( ! _visible ) return;
int tree_top = tree->y();
int tree_bot = tree_top + tree->h();
fl_font(_labelfont, _labelsize);
int H = _labelsize;
if(usericon() && H < usericon()->h()) H = usericon()->h();
@ -586,7 +588,7 @@ void Fl_Tree_Item::draw(int X, int &Y, int W, Fl_Widget *tree,
// 'clipped' is an optimization to prevent drawing anything offscreen.
//
char drawthis = ( is_root() && prefs.showroot() == 0 ) ? 0 : 1;
char clipped = ((Y+H) < tree->y()) || (Y>(tree->y()+tree->h())) ? 1 : 0;
char clipped = ((Y+H) < tree_top) || (Y>tree_bot) ? 1 : 0;
if ( drawthis ) {
// Draw connectors
if ( prefs.connectorstyle() != FL_TREE_CONNECTOR_NONE ) {
@ -696,6 +698,9 @@ void Fl_Tree_Item::draw(int X, int &Y, int W, Fl_Widget *tree,
Y += prefs.openchild_marginbottom(); // offset below open child tree
}
if ( ! lastchild ) {
// Special 'clipped' calculation. (intentional variable shadowing)
int clipped = ((child_y_start < tree_top) && (Y < tree_top)) ||
((child_y_start > tree_bot) && (Y > tree_bot));
if (!clipped) draw_vertical_connector(hstartx, child_y_start, Y, prefs);
}
}