mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make guides and snap work from either side of a widget border. 

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4089 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2005-03-08 04:37:39 +00:00
parent 3ecd5ba911
commit 8769b2f7fa
1 changed files with 159 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

239
fluid/Fl_Window_Type.cxx
View File

@ -461,9 +461,9 @@ void Fl_Window_Type::newposition(Fl_Widget_Type *myo,int &X,int &Y,int &R,int &T
T += dy; T += dy;
} else { } else {
if (drag&LEFT) if (X==bx) X += dx; else if (X<bx+dx) X = bx+dx; if (drag&LEFT) if (X==bx) X += dx; else if (X<bx+dx) X = bx+dx;
if (drag&BOTTOM) if (Y==by) Y += dy; else if (Y<by+dy) Y = by+dy; if (drag&TOP) if (Y==by) Y += dy; else if (Y<by+dy) Y = by+dy;
if (drag&RIGHT) if (R==br) R += dx; else if (R>br+dx) R = br+dx; if (drag&RIGHT) if (R==br) R += dx; else if (R>br+dx) R = br+dx;
if (drag&TOP) if (T==bt) T += dy; else if (T>bt+dx) T = bt+dx; if (drag&BOTTOM) if (T==bt) T += dy; else if (T>bt+dx) T = bt+dx;
} }
if (R<X) {int n = X; X = R; R = n;} if (R<X) {int n = X; X = R; R = n;}
if (T<Y) {int n = Y; Y = T; T = n;} if (T<Y) {int n = Y; Y = T; T = n;}
@ -633,39 +633,41 @@ void Fl_Window_Type::draw_overlay() {
ideal_spacing(xsp, ysp); ideal_spacing(xsp, ysp);
if (drag & DRAG) { if (drag) {
// Check top spacing... // Check top spacing...
if (abs(d = ysp - myby) < 5) { if (abs(d = myby - ysp) < 5) {
dy += d; dy -= d;
mybt += d; if (drag & DRAG) mybt -= d;
myby += d; myby -= d;
draw_v_arrow(mybx+5, myby, 0); draw_v_arrow(mybx+5, myby, 0);
} }
// Check bottom spacing... // Check bottom spacing...
if (abs(d = o->h() - ysp - mybt) < 5) { if (abs(d = o->h() - mybt - ysp) < 5) {
dy += d; dy += d;
myby += d; if (drag & DRAG) myby += d;
mybt += d; mybt += d;
draw_v_arrow(mybx+5, mybt, o->h()); draw_v_arrow(mybx+5, mybt, o->h());
} }
// Check left spacing... // Check left spacing...
if (abs(d = xsp - mybx) < 5) { if (abs(d = mybx - xsp) < 5) {
dx += d; dx -= d;
mybr += d; if (drag & DRAG) mybr -= d;
mybx += d; mybx -= d;
draw_h_arrow(mybx, myby+5, 0); draw_h_arrow(mybx, myby+5, 0);
} }
// Check left spacing... // Check right spacing...
if (abs(d = o->w() - xsp - mybr) < 5) { if (abs(d = o->w() - mybr - xsp) < 5) {
dx += d; dx += d;
mybx += d; if (drag & DRAG) mybx += d;
mybr += d; mybr += d;
draw_h_arrow(mybr, myby+5, o->w()); draw_h_arrow(mybr, myby+5, o->w());
} }
} else if (numselected==1 && selection) { }
if (numselected==1 && selection && !(drag & DRAG)) {
// Check ideal sizes // Check ideal sizes
int w = mybr-mybx; int w = mybr-mybx;
int h = mybt-myby; int h = mybt-myby;
@ -673,37 +675,41 @@ void Fl_Window_Type::draw_overlay() {
mysel->ideal_size(iw, ih); mysel->ideal_size(iw, ih);
// Check height if (drag & (TOP | BOTTOM)) {
if (abs(d = ih - h) < 5) { // Check height
// Resize height if (abs(d = ih - h) < 5) {
if (drag & TOP) { // Resize height
myby -= d; if (drag & TOP) {
dy -= d; myby -= d;
} else { dy -= d;
mybt += d; } else {
dy += d; mybt += d;
dy += d;
}
} }
// Draw height guide
draw_height(mybx < 50 ? mybx+10 : mybx-10, myby, mybt,
mybx < 50 ? FL_ALIGN_RIGHT : FL_ALIGN_LEFT);
} }
// Draw height guide if (drag & (LEFT | RIGHT)) {
draw_height(mybx < 20 ? mybr+10 : mybx-10, myby, mybt, // Check width
mybx < 20 ? FL_ALIGN_RIGHT : FL_ALIGN_LEFT); if (abs(d = iw - w) < 5) {
// Resize width
// Check width if (drag & LEFT) {
if (abs(d = iw - w) < 5) { mybx -= d;
// Resize width dx -= d;
if (drag & LEFT) { } else {
mybx -= d; mybr += d;
dx -= d; dx += d;
} else { }
mybr += d;
dx += d;
} }
}
// Draw width guide // Draw width guide
draw_width(mybx, myby < 20 ? mybt+10 : myby-10, mybr, draw_width(mybx, myby < 50 ? myby+10 : myby-10, mybr,
myby < 20 ? FL_ALIGN_BOTTOM : FL_ALIGN_TOP); myby < 50 ? FL_ALIGN_BOTTOM : FL_ALIGN_TOP);
}
} }
// Check spacing and alignment between individual widgets // Check spacing and alignment between individual widgets
@ -723,7 +729,7 @@ void Fl_Window_Type::draw_overlay() {
if ((drag & (LEFT | DRAG)) && abs(d = mybx - qw->o->x()) < 5) { if ((drag & (LEFT | DRAG)) && abs(d = mybx - qw->o->x()) < 5) {
dx += d; dx += d;
mybx += d; mybx += d;
mybr += d; if (drag & DRAG) mybr += d;
draw_left_brace(qw->o); draw_left_brace(qw->o);
} }
@ -732,7 +738,7 @@ void Fl_Window_Type::draw_overlay() {
if ((drag & (RIGHT | DRAG)) && if ((drag & (RIGHT | DRAG)) &&
abs(d = qw->o->x() + qw->o->w() - mybr) < 5) { abs(d = qw->o->x() + qw->o->w() - mybr) < 5) {
dx += d; dx += d;
mybx += d; if (drag & DRAG) mybx += d;
mybr += d; mybr += d;
draw_right_brace(qw->o); draw_right_brace(qw->o);
@ -743,7 +749,7 @@ void Fl_Window_Type::draw_overlay() {
if ((drag & (TOP | DRAG)) && abs(d = myby - qw->o->y()) < 5) { if ((drag & (TOP | DRAG)) && abs(d = myby - qw->o->y()) < 5) {
dy += d; dy += d;
myby += d; myby += d;
mybt += d; if (drag & DRAG) mybt += d;
draw_top_brace(qw->o); draw_top_brace(qw->o);
} }
@ -751,57 +757,130 @@ void Fl_Window_Type::draw_overlay() {
// Align to bottom of other widget... // Align to bottom of other widget...
if ((drag & (BOTTOM | DRAG)) && abs(d = qw->o->y() + qw->o->h() - mybt) < 5) { if ((drag & (BOTTOM | DRAG)) && abs(d = qw->o->y() + qw->o->h() - mybt) < 5) {
dy += d; dy += d;
myby += d; if (drag & DRAG) myby += d;
mybt += d; mybt += d;
draw_bottom_brace(qw->o); draw_bottom_brace(qw->o);
} }
// Check spacing between widgets // Check spacing between widgets
qw->ideal_spacing(xsp, ysp); if (mysel->is_group()) mysel->ideal_spacing(xsp, ysp);
else qw->ideal_spacing(xsp, ysp);
if ((qw->o->y()+qw->o->h())>=myby && qw->o->y()<=mybt) { if ((qw->o->y()+qw->o->h())>=myby && qw->o->y()<=mybt) {
// Compare left of selected to right of current if (drag & (LEFT | DRAG)) {
if ((drag & (LEFT | DRAG)) && abs(d = xsp - (mybx - qw->o->x() - qw->o->w())) < 5) { // Compare left of selected to left of current
dx += d; if (abs(d = qw->o->x() - mybx - xsp) >= 5)
mybx += d; d = qw->o->x() - mybx + xsp;
mybr += d;
// Draw left arrow if (abs(d) < 5) {
draw_h_arrow(mybx, (myby+mybt)/2, qw->o->x()+qw->o->w()); dx += d;
} mybx += d;
if (drag & DRAG) mybr += d;
// Compare right of selected to left of current // Draw left arrow
if ((drag & (RIGHT | DRAG)) && abs(d = qw->o->x() - mybr - xsp) < 5) { draw_h_arrow(mybx, (myby+mybt)/2, qw->o->x());
dx += d; }
mybx += d;
mybr += d;
// Draw right arrow // Compare left of selected to right of current
draw_h_arrow(mybr, (myby+mybt)/2, qw->o->x()); if (abs(d = qw->o->x() + qw->o->w() - mybx - xsp) >= 5)
d = qw->o->x() + qw->o->w() - mybx + xsp;
if (abs(d) < 5) {
dx += d;
mybx += d;
if (drag & DRAG) mybr += d;
// Draw left arrow
draw_h_arrow(mybx, (myby+mybt)/2, qw->o->x() + qw->o->w());
}
}
if (drag & (RIGHT | DRAG)) {
// Compare right of selected to left of current
if (abs(d = qw->o->x() - mybr - xsp) >= 5)
d = qw->o->x() - mybr + xsp;
if (abs(d) < 5) {
dx += d;
if (drag & DRAG) mybx += d;
mybr += d;
// Draw right arrow
draw_h_arrow(mybr, (myby+mybt)/2, qw->o->x());
}
// Compare right of selected to right of current
if (abs(d = qw->o->x() + qw->o->w() - mybr + xsp) >= 5)
d = qw->o->x() + qw->o->w() - mybr - xsp;
if (abs(d) < 5) {
dx += d;
if (drag & DRAG) mybx += d;
mybr += d;
// Draw right arrow
draw_h_arrow(mybr, (myby+mybt)/2, qw->o->x() + qw->o->w());
}
} }
} }
if ((qw->o->x()+qw->o->w())>=mybx && qw->o->x()<=mybr) { if ((qw->o->x()+qw->o->w())>=mybx && qw->o->x()<=mybr) {
// Compare top of selected to bottom of current // Compare top of selected to top of current
if ((drag & (TOP | DRAG)) && abs(d = ysp - (myby - qw->o->y() - qw->o->h())) < 5) { if (drag & (TOP | DRAG)) {
dy += d; if (abs(d = qw->o->y() - myby - ysp) >= 5)
myby += d; d = qw->o->y() - myby + ysp;
mybt += d;
// Draw up arrow... if (abs(d) < 5) {
draw_v_arrow((mybx+mybr)/2, myby, qw->o->y()+qw->o->h()); dy += d;
} myby += d;
if (drag & DRAG) mybt += d;
// Draw up arrow...
draw_v_arrow((mybx+mybr)/2, myby, qw->o->y());
}
// Compare top of selected to bottom of current
if (abs(d = qw->o->y() + qw->o->h() - myby - ysp) >= 5)
d = qw->o->y() + qw->o->h() - myby + ysp;
if (abs(d) < 5) {
dy += d;
myby += d;
if (drag & DRAG) mybt += d;
// Draw up arrow...
draw_v_arrow((mybx+mybr)/2, myby, qw->o->y()+qw->o->h());
}
}
// Compare bottom of selected to top of current // Compare bottom of selected to top of current
if ((drag & (BOTTOM | DRAG)) && abs(d = qw->o->y() - mybt - ysp) < 5) { if (drag & (BOTTOM | DRAG)) {
dy += d; if (abs(d = qw->o->y() - mybt - ysp) >= 5)
myby += d; d = qw->o->y() - mybt + ysp;
mybt += d;
// Draw down arrow... if (abs(d) < 5) {
draw_v_arrow((mybx+mybr)/2, mybt, qw->o->y()); dy += d;
} if (drag & DRAG) myby += d;
mybt += d;
// Draw down arrow...
draw_v_arrow((mybx+mybr)/2, mybt, qw->o->y());
}
// Compare bottom of selected to bottom of current
if (abs(d = qw->o->y() + qw->o->h() - mybt - ysp) >= 5)
d = qw->o->y() + qw->o->h() - mybt + ysp;
if (abs(d) < 5) {
dy += d;
if (drag & DRAG) myby += d;
mybt += d;
// Draw down arrow...
draw_v_arrow((mybx+mybr)/2, mybt, qw->o->y() + qw->o->h());
}
}
} }
} }
} }
@ -915,8 +994,8 @@ int Fl_Window_Type::handle(int event) {
if (mx>=br-w1) drag |= RIGHT; if (mx>=br-w1) drag |= RIGHT;
else if (mx<bx+w1) drag |= LEFT; else if (mx<bx+w1) drag |= LEFT;
w1 = (bt-by)/4; if (w1 > snap1) w1 = snap1; w1 = (bt-by)/4; if (w1 > snap1) w1 = snap1;
if (my<=by+w1) drag |= BOTTOM; if (my<=by+w1) drag |= TOP;
else if (my>bt-w1) drag |= TOP; else if (my>bt-w1) drag |= BOTTOM;
if (!drag) drag = DRAG; if (!drag) drag = DRAG;
} }
// do object-specific selection of other objects: // do object-specific selection of other objects: