diff --git a/src/zoom-context.cpp b/src/zoom-context.cpp
index f7bae09e925b8541147fd64100763049018d4fc1..62395581f400003b269957e8da74589f68b4431e 100644 (file)
--- a/src/zoom-context.cpp
+++ b/src/zoom-context.cpp
GType sp_zoom_context_get_type(void)
{
static GType type = 0;
-
+
if (!type) {
GTypeInfo info = {
sizeof(SPZoomContextClass),
};
type = g_type_register_static(SP_TYPE_EVENT_CONTEXT, "SPZoomContext", &info, (GTypeFlags) 0);
}
-
+
return type;
}
static void sp_zoom_context_class_init(SPZoomContextClass *klass)
{
SPEventContextClass *event_context_class = (SPEventContextClass *) klass;
-
+
parent_class = (SPEventContextClass*) g_type_class_peek_parent(klass);
-
+
event_context_class->setup = sp_zoom_context_setup;
event_context_class->finish = sp_zoom_context_finish;
static void sp_zoom_context_init (SPZoomContext *zoom_context)
{
SPEventContext *event_context = SP_EVENT_CONTEXT(zoom_context);
-
+
event_context->cursor_shape = cursor_zoom_xpm;
event_context->hot_x = 6;
event_context->hot_y = 6;
@@ -110,7 +110,7 @@ static gint sp_zoom_context_item_handler(SPEventContext *event_context, SPItem *
if (((SPEventContextClass *) parent_class)->item_handler) {
ret = ((SPEventContextClass *) parent_class)->item_handler (event_context, item, event);
}
-
+
return ret;
}
@@ -119,17 +119,17 @@ static gint sp_zoom_context_root_handler(SPEventContext *event_context, GdkEvent
SPDesktop *desktop = event_context->desktop;
tolerance = prefs_get_int_attribute_limited ("options.dragtolerance", "value", 0, 0, 100);
double const zoom_inc = prefs_get_double_attribute_limited("options.zoomincrement", "value", M_SQRT2, 1.01, 10);
-
+
gint ret = FALSE;
-
+
switch (event->type) {
case GDK_BUTTON_PRESS:
if (event->button.button == 1) {
// save drag origin
- xp = (gint) event->button.x;
+ xp = (gint) event->button.x;
yp = (gint) event->button.y;
within_tolerance = true;
-
+
NR::Point const button_w(event->button.x, event->button.y);
NR::Point const button_dt(desktop->w2d(button_w));
Inkscape::Rubberband::get()->start(desktop, button_dt);
@@ -139,27 +139,27 @@ static gint sp_zoom_context_root_handler(SPEventContext *event_context, GdkEvent
ret = TRUE;
}
break;
-
+
case GDK_MOTION_NOTIFY:
if (event->motion.state & GDK_BUTTON1_MASK) {
ret = TRUE;
-
+
if ( within_tolerance
&& ( abs( (gint) event->motion.x - xp ) < tolerance )
&& ( abs( (gint) event->motion.y - yp ) < tolerance ) ) {
break; // do not drag if we're within tolerance from origin
}
- // Once the user has moved farther than tolerance from the original location
- // (indicating they intend to move the object, not click), then always process the
+ // Once the user has moved farther than tolerance from the original location
+ // (indicating they intend to move the object, not click), then always process the
// motion notify coordinates as given (no snapping back to origin)
- within_tolerance = false;
-
+ within_tolerance = false;
+
NR::Point const motion_w(event->motion.x, event->motion.y);
NR::Point const motion_dt(desktop->w2d(motion_w));
Inkscape::Rubberband::get()->move(motion_dt);
}
break;
-
+
case GDK_BUTTON_RELEASE:
if ( event->button.button == 1 ) {
NR::Maybe<NR::Rect> const b = Inkscape::Rubberband::get()->getRectangle();
@@ -176,22 +176,22 @@ static gint sp_zoom_context_root_handler(SPEventContext *event_context, GdkEvent
ret = TRUE;
}
Inkscape::Rubberband::get()->stop();
- xp = yp = 0;
+ xp = yp = 0;
escaped = false;
break;
-
+
case GDK_KEY_PRESS:
switch (get_group0_keyval (&event->key)) {
case GDK_Escape:
Inkscape::Rubberband::get()->stop();
- xp = yp = 0;
+ xp = yp = 0;
escaped = true;
ret = TRUE;
break;
- case GDK_Up:
- case GDK_Down:
- case GDK_KP_Up:
- case GDK_KP_Down:
+ case GDK_Up:
+ case GDK_Down:
+ case GDK_KP_Up:
+ case GDK_KP_Down:
// prevent the zoom field from activation
if (!MOD__CTRL_ONLY)
ret = TRUE;