From 783bccf8cf45d86a4ee401033effe2823488ba57 Mon Sep 17 00:00:00 2001 From: Chayan Deb Date: Thu, 23 Jan 2025 19:14:58 +0530 Subject: [PATCH] Added changes to resolve merge conflicts --- src/callback.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/callback.c b/src/callback.c index 3d7000e2..b97cf9e9 100644 --- a/src/callback.c +++ b/src/callback.c @@ -2882,7 +2882,7 @@ int rstate; /* (reduced state, without ShiftMask) */ hilight_net_pin_mismatches(); break; } - if(key== 's' /* && !xctx->ui_state */ && rstate == 0) { /* create wire snapping to closest instance pin */ + if(key== 'W' /* && !xctx->ui_state */ && rstate == 0) { /* create wire snapping to closest instance pin */ if(xctx->semaphore >= 2) break; snapped_wire(c_snap); break; @@ -4366,9 +4366,9 @@ int rstate; /* (reduced state, without ShiftMask) */ } /* end wire creation when dragging in intuitive interface from an inst pin ow wire endpoint */ - /*else if(state == Button1Mask && xctx->intuitive_interface && (xctx->ui_state & STARTWIRE)) {*/ - /* if(end_place_move_copy_zoom()) break;*/ - /*}*/ + else if(state == Button1Mask && xctx->intuitive_interface && (xctx->ui_state & STARTWIRE)) { + if(end_place_move_copy_zoom()) break; + } /* end intuitive_interface copy or move */ if(xctx->ui_state & STARTCOPY && xctx->drag_elements) {