use ctrl-drag to duplicate

horizon-eda · Jun 18, 2019 · 7406a05 · 7406a05
1 parent 3567736
commit 7406a05
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/core/tool_paste.cpp b/src/core/tool_paste.cpp
@@ -417,7 +417,7 @@ ToolResponse ToolPaste::update(const ToolArgs &args)
             update_tip();
             return ToolResponse::fast();
         }
-        else if (args.type == ToolEventType::CLICK) {
+        else if (args.type == ToolEventType::CLICK || (is_transient && args.type == ToolEventType::CLICK_RELEASE)) {
             if (args.button == 1) {
                 merge_selected_junctions();
                 core.r->commit();

diff --git a/src/imp/imp.cpp b/src/imp/imp.cpp
@@ -683,7 +683,7 @@ void ImpBase::run(int argc, char *argv[])
 
     canvas->signal_motion_notify_event().connect([this](GdkEventMotion *ev) {
         if (selection_for_drag_move.size()) {
-            handle_drag();
+            handle_drag(ev->state & Gdk::CONTROL_MASK);
         }
         return false;
     });
@@ -878,7 +878,7 @@ void ImpBase::handle_tool_action(const ActionConnection &conn)
     tool_begin(conn.tool_id);
 }
 
-void ImpBase::handle_drag()
+void ImpBase::handle_drag(bool ctrl)
 {
     auto pos = canvas->get_cursor_pos_win();
     auto delta = pos - cursor_pos_drag_begin;
@@ -889,7 +889,13 @@ void ImpBase::handle_drag()
             ToolArgs args;
             args.coords = cursor_pos_grid_drag_begin;
             args.selection = selection_for_drag_move;
-            ToolResponse r = core.r->tool_begin(ToolID::MOVE, args, imp_interface.get(), true);
+            ToolID tool_id;
+            if (ctrl)
+                tool_id = ToolID::DUPLICATE;
+            else
+                tool_id = ToolID::MOVE;
+
+            ToolResponse r = core.r->tool_begin(tool_id, args, imp_interface.get(), true);
             tool_process(r);
         }
         selection_for_drag_move.clear();

diff --git a/src/imp/imp.hpp b/src/imp/imp.hpp
@@ -159,7 +159,7 @@ class ImpBase {
 private:
     void fix_cursor_pos();
     Glib::RefPtr<Gio::FileMonitor> preferences_monitor;
-    void handle_drag();
+    void handle_drag(bool ctrl);
     void update_selection_label();
     std::string get_tool_settings_filename(ToolID id);