Add a centralized check (i.e. in the snapper mechanism) whether we've snapped or...

[inkscape.git] / src / rect-context.cpp

diff --git a/src/rect-context.cpp b/src/rect-context.cpp
index 7de7aa5072505bc6aa520e964b8b0512a704b875..b8047b201eae2544285c0d83dfa4b732dc878df1 100644 (file)
--- a/src/rect-context.cpp
+++ b/src/rect-context.cpp
@@ -15,8 +15,11 @@
  */
 
 #include "config.h"
+#include "inkscape.h"
 
 #include <gdk/gdkkeysyms.h>
+#include <cstring>
+#include <string>
 
 #include "macros.h"
 #include "display/sp-canvas.h"
@@ -24,6 +27,7 @@
 #include "document.h"
 #include "sp-namedview.h"
 #include "selection.h"
+#include "selection-chemistry.h"
 #include "desktop-handles.h"
 #include "snap.h"
 #include "desktop.h"
@@ -39,6 +43,8 @@
 #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);
@@ -298,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::SNAPPOINT_NODE | Inkscape::Snapper::SNAPPOINT_BBOX,
-                                    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       |
@@ -329,11 +336,12 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent
                                      event->motion.y);
             NR::Point motion_dt(desktop->w2d(motion_w));
             
-            SnapManager const &m = desktop->namedview->snap_manager;
-            motion_dt = m.freeSnap(Inkscape::Snapper::SNAPPOINT_BBOX | Inkscape::Snapper::SNAPPOINT_NODE, motion_dt, rc->item).getPoint();
+            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;
@@ -397,6 +405,27 @@ 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
@@ -487,9 +516,38 @@ static void sp_rect_drag(SPRectContext &rc, NR::Point const pt, guint 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 &#215; %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 &#215; %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 &#215; %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 &#215; %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 &#215; %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);
 }