diff options
| author | Ralf Stephan <ralf@ark.in-berlin.de> | 2006-02-15 19:04:29 +0000 |
|---|---|---|
| committer | rwst <rwst@users.sourceforge.net> | 2006-02-15 19:04:29 +0000 |
| commit | 7b0114087822b9f011d740f1279d1d9ed983a88c (patch) | |
| tree | 159bd147d5a3b2daa65b327dd3f5d0b2e764eeb9 /src/context-fns.cpp | |
| parent | fix 1432089: stroke is not drawn not only when it's not set but also when it'... (diff) | |
| download | inkscape-7b0114087822b9f011d740f1279d1d9ed983a88c.tar.gz inkscape-7b0114087822b9f011d740f1279d1d9ed983a88c.zip | |
bulk trailing spaces removal. consistency through MD5 of binary
(bzr r149)
Diffstat (limited to 'src/context-fns.cpp')
| -rw-r--r-- | src/context-fns.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/context-fns.cpp b/src/context-fns.cpp index 42100d49a..6c36e780f 100644 --- a/src/context-fns.cpp +++ b/src/context-fns.cpp @@ -22,13 +22,13 @@ bool Inkscape::have_viable_layer(SPDesktop *desktop, MessageContext *message) { SPItem const *layer = SP_ITEM(desktop->currentLayer()); - + if ( !layer || desktop->itemIsHidden(layer) ) { message->flash(Inkscape::ERROR_MESSAGE, _("<b>Current layer is hidden</b>. Unhide it to be able to draw on it.")); return false; } - + if ( !layer || layer->isLocked() ) { message->flash(Inkscape::ERROR_MESSAGE, _("<b>Current layer is locked</b>. Unlock it to be able to draw on it.")); @@ -51,13 +51,13 @@ bool Inkscape::have_viable_layer(SPDesktop *desktop, MessageContext *message) bool Inkscape::have_viable_layer(SPDesktop *desktop, MessageStack *message) { SPItem const *layer = SP_ITEM(desktop->currentLayer()); - + if ( !layer || desktop->itemIsHidden(layer) ) { message->flash(Inkscape::WARNING_MESSAGE, _("<b>Current layer is hidden</b>. Unhide it to be able to draw on it.")); return false; } - + if ( !layer || layer->isLocked() ) { message->flash(Inkscape::WARNING_MESSAGE, _("<b>Current layer is locked</b>. Unlock it to be able to draw on it.")); @@ -94,7 +94,7 @@ NR::Rect Inkscape::snap_rectangular_box(SPDesktop const *desktop, SPItem *item, /* p[1] is the dragged point with the integer-ratio constraint */ p[1] = center + delta; - + if (shift) { /* Shift is down, so our origin is the centre point rather than the corner @@ -103,7 +103,7 @@ NR::Rect Inkscape::snap_rectangular_box(SPDesktop const *desktop, SPItem *item, /* p[0] is the opposite corner of our box */ p[0] = center - delta; - + Inkscape::SnappedPoint s[2]; /* Try to snap p[0] (the opposite corner) along the constraint vector */ @@ -122,20 +122,20 @@ NR::Rect Inkscape::snap_rectangular_box(SPDesktop const *desktop, SPItem *item, p[0] = 2 * center - s[1].getPoint(); p[1] = s[1].getPoint(); } - + } else { /* Our origin is the opposite corner. Snap the drag point along the constraint vector */ p[0] = center; p[1] = m.constrainedSnap(Inkscape::Snapper::SNAP_POINT, p[1], p[1] - p[0], item).getPoint(); } - + } else if (shift) { /* Shift is down, so our origin is the centre point rather than the corner point; ** this means that corner-point movements are bound to each other. */ - + p[1] = pt; p[0] = 2 * center - p[1]; @@ -151,9 +151,9 @@ NR::Rect Inkscape::snap_rectangular_box(SPDesktop const *desktop, SPItem *item, p[0] = 2 * center - s[1].getPoint(); p[1] = s[1].getPoint(); } - + } else { - + /* There's no constraint on the corner point, so just snap it to anything */ p[0] = center; p[1] = m.freeSnap(Inkscape::Snapper::SNAP_POINT, pt, item).getPoint(); |