![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/rect-context.cpp b/src/rect-context.cpp
index b03cdeead7c08dc5aee4bd0a3be52900a8587bfc..b8047b201eae2544285c0d83dfa4b732dc878df1 100644 (file)
--- a/src/rect-context.cpp
+++ b/src/rect-context.cpp
* Lauris Kaplinski <lauris@kaplinski.com>
* bulia byak <buliabyak@users.sf.net>
*
+ * Copyright (C) 2006 Johan Engelen <johan@shouraizou.nl>
* Copyright (C) 2000-2005 authors
* Copyright (C) 2000-2001 Ximian, Inc.
*
*/
#include "config.h"
+#include "inkscape.h"
#include <gdk/gdkkeysyms.h>
+#include <cstring>
+#include <string>
#include "macros.h"
#include "display/sp-canvas.h"
#include "document.h"
#include "sp-namedview.h"
#include "selection.h"
+#include "selection-chemistry.h"
#include "desktop-handles.h"
#include "snap.h"
#include "desktop.h"
#include "desktop-style.h"
#include "message-context.h"
#include "pixmaps/cursor-rect.xpm"
-#include "pixmaps/cursor-rect.pixbuf"
#include "rect-context.h"
#include "sp-metrics.h"
#include <glibmm/i18n.h>
#include "prefs-utils.h"
#include "context-fns.h"
+//static const double goldenratio = 1.61803398874989484820; // golden ratio
+
static void sp_rect_context_class_init(SPRectContextClass *klass);
static void sp_rect_context_init(SPRectContext *rect_context);
static void sp_rect_context_dispose(GObject *object);
SPEventContext *event_context = SP_EVENT_CONTEXT(rect_context);
event_context->cursor_shape = cursor_rect_xpm;
- event_context->cursor_pixbuf = gdk_pixbuf_new_from_inline(
- -1,
- cursor_rect_pixbuf,
- FALSE,
- NULL);
event_context->hot_x = 4;
event_context->hot_y = 4;
event_context->xp = 0;
@@ -254,7 +255,7 @@ static gint sp_rect_context_item_handler(SPEventContext *event_context, SPItem *
switch (event->type) {
case GDK_BUTTON_PRESS:
- if ( event->button.button == 1 ) {
+ if ( event->button.button == 1 && !event_context->space_panning) {
Inkscape::setup_for_drag_start(desktop, event_context, event);
ret = TRUE;
}
@@ -285,7 +286,7 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent
gint ret = FALSE;
switch (event->type) {
case GDK_BUTTON_PRESS:
- if ( event->button.button == 1 ) {
+ if (event->button.button == 1 && !event_context->space_panning) {
NR::Point const button_w(event->button.x,
event->button.y);
@@ -303,10 +304,11 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent
NR::Point const button_dt(desktop->w2d(button_w));
/* Snap center */
- SnapManager const &m = desktop->namedview->snap_manager;
- rc->center = m.freeSnap(Inkscape::Snapper::SNAP_POINT | Inkscape::Snapper::BBOX_POINT,
- button_dt, rc->item).getPoint();
-
+ SnapManager &m = desktop->namedview->snap_manager;
+ m.setup(desktop, rc->item);
+ m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, button_dt);
+ rc->center = button_dt;
+
sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
( GDK_KEY_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK |
@@ -318,7 +320,7 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent
break;
case GDK_MOTION_NOTIFY:
if ( dragging
- && ( event->motion.state & GDK_BUTTON1_MASK ) )
+ && (event->motion.state & GDK_BUTTON1_MASK) && !event_context->space_panning)
{
if ( event_context->within_tolerance
&& ( abs( (gint) event->motion.x - event_context->xp ) < event_context->tolerance )
@@ -332,14 +334,20 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent
NR::Point const motion_w(event->motion.x,
event->motion.y);
- NR::Point const motion_dt(desktop->w2d(motion_w));
+ NR::Point motion_dt(desktop->w2d(motion_w));
+
+ SnapManager &m = desktop->namedview->snap_manager;
+ m.setup(desktop, rc->item);
+ m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, motion_dt);
+
sp_rect_drag(*rc, motion_dt, event->motion.state);
+ gobble_motion_events(GDK_BUTTON1_MASK);
ret = TRUE;
}
break;
case GDK_BUTTON_RELEASE:
event_context->xp = event_context->yp = 0;
- if ( event->button.button == 1 ) {
+ if (event->button.button == 1 && !event_context->space_panning) {
dragging = false;
if (!event_context->within_tolerance) {
@@ -373,10 +381,12 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent
case GDK_Shift_R:
case GDK_Meta_L: // Meta is when you press Shift+Alt (at least on my machine)
case GDK_Meta_R:
- sp_event_show_modifier_tip (event_context->defaultMessageContext(), event,
- _("<b>Ctrl</b>: make square or integer-ratio rect, lock a rounded corner circular"),
- _("<b>Shift</b>: draw around the starting point"),
- NULL);
+ if (!dragging){
+ sp_event_show_modifier_tip (event_context->defaultMessageContext(), event,
+ _("<b>Ctrl</b>: make square or integer-ratio rect, lock a rounded corner circular"),
+ _("<b>Shift</b>: draw around the starting point"),
+ NULL);
+ }
break;
case GDK_Up:
case GDK_Down:
@@ -395,9 +405,45 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent
}
break;
+ case GDK_T:
+ {
+ Inkscape::Selection *selection = sp_desktop_selection (inkscape_active_desktop());
+ SPItem *item = selection->singleItem();
+ if (item && SP_IS_RECT (item)) {
+ g_print ("Scaling transformation matrix\n");
+ SP_RECT (item)->transform = NR::Matrix(NR::scale(1.25, 1.5));
+ SP_OBJECT (item)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+ }
+ ret = TRUE;
+ }
+ break;
+
+ case GDK_g:
+ case GDK_G:
+ if (MOD__SHIFT_ONLY) {
+ sp_selection_to_guides();
+ ret = true;
+ }
+ break;
+
case GDK_Escape:
sp_desktop_selection(desktop)->clear();
//TODO: make dragging escapable by Esc
+ break;
+
+ case GDK_space:
+ if (dragging) {
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
+ event->button.time);
+ dragging = false;
+ if (!event_context->within_tolerance) {
+ // we've been dragging, finish the rect
+ sp_rect_finish(rc);
+ }
+ // do not return true, so that space would work switching to selector
+ }
+ break;
+
default:
break;
}
}
/* Create object */
- Inkscape::XML::Node *repr = sp_repr_new("svg:rect");
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(SP_EVENT_CONTEXT_DOCUMENT(&rc));
+ Inkscape::XML::Node *repr = xml_doc->createElement("svg:rect");
/* Set style */
sp_desktop_apply_style_tool (desktop, repr, "tools.shapes.rect", false);
Inkscape::GC::release(repr);
rc.item->transform = SP_ITEM(desktop->currentRoot())->getRelativeTransform(desktop->currentLayer());
rc.item->updateRepr();
+
+ sp_canvas_force_full_redraw_after_interruptions(desktop->canvas, 5);
}
NR::Rect const r = Inkscape::snap_rectangular_box(desktop, rc.item, pt, rc.center, state);
}
// status text
- GString *xs = SP_PX_TO_METRIC_STRING(r.dimensions()[NR::X], desktop->namedview->getDefaultMetric());
- GString *ys = SP_PX_TO_METRIC_STRING(r.dimensions()[NR::Y], desktop->namedview->getDefaultMetric());
- rc._message_context->setF(Inkscape::NORMAL_MESSAGE, _("<b>Rectangle</b>: %s × %s; with <b>Ctrl</b> to make square or integer-ratio rectangle; with <b>Shift</b> to draw around the starting point"), xs->str, ys->str);
+ double rdimx = r.dimensions()[NR::X];
+ double rdimy = r.dimensions()[NR::Y];
+ GString *xs = SP_PX_TO_METRIC_STRING(rdimx, desktop->namedview->getDefaultMetric());
+ GString *ys = SP_PX_TO_METRIC_STRING(rdimy, desktop->namedview->getDefaultMetric());
+ if (state & GDK_CONTROL_MASK) {
+ int ratio_x, ratio_y;
+ bool is_golden_ratio = false;
+ if (fabs (rdimx) > fabs (rdimy)) {
+ if (fabs(rdimx / rdimy - goldenratio) < 1e-6) {
+ is_golden_ratio = true;
+ }
+ ratio_x = (int) rint (rdimx / rdimy);
+ ratio_y = 1;
+ } else {
+ if (fabs(rdimy / rdimx - goldenratio) < 1e-6) {
+ is_golden_ratio = true;
+ }
+ ratio_x = 1;
+ ratio_y = (int) rint (rdimy / rdimx);
+ }
+ if (!is_golden_ratio) {
+ rc._message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("<b>Rectangle</b>: %s × %s (constrained to ratio %d:%d); with <b>Shift</b> to draw around the starting point"), xs->str, ys->str, ratio_x, ratio_y);
+ } else {
+ if (ratio_y == 1) {
+ rc._message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("<b>Rectangle</b>: %s × %s (constrained to golden ratio 1.618 : 1); with <b>Shift</b> to draw around the starting point"), xs->str, ys->str);
+ } else {
+ rc._message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("<b>Rectangle</b>: %s × %s (constrained to golden ratio 1 : 1.618); with <b>Shift</b> to draw around the starting point"), xs->str, ys->str);
+ }
+ }
+ } else {
+ rc._message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("<b>Rectangle</b>: %s × %s; with <b>Ctrl</b> to make square or integer-ratio rectangle; with <b>Shift</b> to draw around the starting point"), xs->str, ys->str);
+ }
g_string_free(xs, FALSE);
g_string_free(ys, FALSE);
}
rc->_message_context->clear();
if ( rc->item != NULL ) {
- SPDesktop * dt;
+ SPDesktop * desktop;
- dt = SP_EVENT_CONTEXT_DESKTOP(rc);
+ desktop = SP_EVENT_CONTEXT_DESKTOP(rc);
SP_OBJECT(rc->item)->updateRepr();
- sp_desktop_selection(dt)->set(rc->item);
- sp_document_done(sp_desktop_document(dt), SP_VERB_CONTEXT_RECT,
+ sp_canvas_end_forced_full_redraws(desktop->canvas);
+
+ sp_desktop_selection(desktop)->set(rc->item);
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_RECT,
_("Create rectangle"));
rc->item = NULL;