![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 84bc1709bea9d0ea7c01f962b7180674c055889f..0409e64b11ad9bd644abc44b8c722f53c6f0d2c4 100644 (file)
* Diederik van Lierop
*
* Copyright (C) Johan Engelen 2009 <j.b.c.engelen@utwente.nl>
- * Copyright (C) Diederik van Lierop 2009 <mail@diedenrezi.nl>
+ * Copyright (C) Diederik van Lierop 2010 <mail@diedenrezi.nl>
*
* Released under GNU GPL, read the file 'COPYING' for more information
*/
#include "desktop.h"
#include "desktop-handles.h"
#include "display/sodipodi-ctrl.h"
+#include "display/sodipodi-ctrlrect.h"
#include "display/canvas-text.h"
+#include "display/sp-canvas-util.h"
#include "knot.h"
#include "preferences.h"
#include <glibmm/i18n.h>
SnapIndicator::SnapIndicator(SPDesktop * desktop)
: _snaptarget(NULL),
_snaptarget_tooltip(NULL),
+ _snaptarget_bbox(NULL),
_snapsource(NULL),
+ _snaptarget_is_presnap(false),
_desktop(desktop)
{
}
}
void
-SnapIndicator::set_new_snaptarget(Inkscape::SnappedPoint const &p)
+SnapIndicator::set_new_snaptarget(Inkscape::SnappedPoint const &p, bool pre_snap)
{
remove_snaptarget(); //only display one snaptarget at a time
g_assert(_desktop != NULL);
if (!p.getSnapped()) {
- g_warning("No snapping took place, so no snap target will be displayed");
return; // If we haven't snapped, then it is of no use to draw a snapindicator
}
+ if (p.getTarget() == SNAPTARGET_CONSTRAINT) {
+ // This is not a real snap, although moving along the constraint did affect the mouse pointer's position.
+ // Maybe we should only show a snap indicator when the user explicitly asked for a constraint by pressing ctrl?
+ // We should not show a snap indicator when stretching a selection box, which is also constrained. That would be
+ // too much information.
+ return;
+ }
+
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
bool value = prefs->getBool("/options/snapindicator/value", true);
case SNAPTARGET_CONSTRAINED_ANGLE:
target_name = _("constrained angle");
break;
+ case SNAPTARGET_CONSTRAINT:
+ target_name = _("constraint");
+ break;
default:
g_warning("Snap target has not yet been defined!");
break;
case SNAPSOURCE_ROTATION_CENTER:
source_name = _("Object rotation center");
break;
- case SNAPSOURCE_HANDLE:
+ case SNAPSOURCE_NODE_HANDLE:
+ case SNAPSOURCE_OTHER_HANDLE:
source_name = _("Handle");
break;
case SNAPSOURCE_PATH_INTERSECTION:
case SNAPSOURCE_TEXT_BASELINE:
source_name = _("Text baseline");
break;
+ case SNAPSOURCE_GRID_PITCH:
+ source_name = _("Multiple of grid spacing");
+ break;
default:
g_warning("Snap source has not yet been defined!");
break;
"anchor", GTK_ANCHOR_CENTER,
"size", 10.0,
"stroked", TRUE,
- "stroke_color", 0xf000f0ff,
+ "stroke_color", pre_snap ? 0x7f7f7fff : 0xff0000ff,
"mode", SP_KNOT_MODE_XOR,
"shape", SP_KNOT_SHAPE_DIAMOND,
NULL );
"anchor", GTK_ANCHOR_CENTER,
"size", 10.0,
"stroked", TRUE,
- "stroke_color", 0xf000f0ff,
+ "stroke_color", pre_snap ? 0x7f7f7fff : 0xff0000ff,
"mode", SP_KNOT_MODE_XOR,
"shape", SP_KNOT_SHAPE_CROSS,
NULL );
SP_CTRL(canvasitem)->moveto(p.getPoint());
_snaptarget = _desktop->add_temporary_canvasitem(canvasitem, timeout_val);
+ _snaptarget_is_presnap = pre_snap;
- gchar *tooltip_str = g_strconcat(source_name, _(" to "), target_name, NULL);
+ // Display the tooltip, which reveals the type of snap source and the type of snap target
+ gchar *tooltip_str = NULL;
+ if (p.getSource() != SNAPSOURCE_GRID_PITCH) {
+ tooltip_str = g_strconcat(source_name, _(" to "), target_name, NULL);
+ } else {
+ tooltip_str = g_strdup(source_name);
+ }
Geom::Point tooltip_pos = p.getPoint() + _desktop->w2d(Geom::Point(15, -15));
SPCanvasItem *canvas_tooltip = sp_canvastext_new(sp_desktop_tempgroup(_desktop), _desktop, tooltip_pos, tooltip_str);
+ if (pre_snap) {
+ SP_CANVASTEXT(canvas_tooltip)->rgba = 0x7f7f7fff;
+ }
g_free(tooltip_str);
sp_canvastext_set_anchor((SPCanvasText* )canvas_tooltip, -1, 1);
_snaptarget_tooltip = _desktop->add_temporary_canvasitem(canvas_tooltip, timeout_val);
+
+ // Display the bounding box, if we snapped to one
+ Geom::OptRect const bbox = p.getTargetBBox();
+ if (bbox) {
+ SPCanvasItem* box = sp_canvas_item_new(sp_desktop_tempgroup (_desktop),
+ SP_TYPE_CTRLRECT,
+ NULL);
+
+ SP_CTRLRECT(box)->setRectangle(*bbox);
+ SP_CTRLRECT(box)->setColor(pre_snap ? 0x7f7f7fff : 0xff0000ff, 0, 0);
+ SP_CTRLRECT(box)->setDashed(true);
+ sp_canvas_item_move_to_z(box, 0);
+ _snaptarget_bbox = _desktop->add_temporary_canvasitem(box, timeout_val);
+ }
}
}
void
-SnapIndicator::remove_snaptarget()
+SnapIndicator::remove_snaptarget(bool only_if_presnap)
{
+ if (only_if_presnap && !_snaptarget_is_presnap) {
+ return;
+ }
+
if (_snaptarget) {
_desktop->remove_temporary_canvasitem(_snaptarget);
_snaptarget = NULL;
+ _snaptarget_is_presnap = false;
}
if (_snaptarget_tooltip) {
_snaptarget_tooltip = NULL;
}
+ if (_snaptarget_bbox) {
+ _desktop->remove_temporary_canvasitem(_snaptarget_bbox);
+ _snaptarget_bbox = NULL;
+ }
+
}
void
"anchor", GTK_ANCHOR_CENTER,
"size", 6.0,
"stroked", TRUE,
- "stroke_color", 0xf000f0ff,
+ "stroke_color", 0xff0000ff,
"mode", SP_KNOT_MODE_XOR,
"shape", SP_KNOT_SHAPE_CIRCLE,
NULL );