luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added changes to resolve merge conflicts

This commit is contained in:
Chayan Deb 2025-01-23 19:14:58 +05:30
parent 710f857765
commit 783bccf8cf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/callback.c
View File

@ -2882,7 +2882,7 @@ int rstate; /* (reduced state, without ShiftMask) */
hilight_net_pin_mismatches(); hilight_net_pin_mismatches();
break; 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; if(xctx->semaphore >= 2) break;
snapped_wire(c_snap); snapped_wire(c_snap);
break; 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 */ /* 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)) {*/ else if(state == Button1Mask && xctx->intuitive_interface && (xctx->ui_state & STARTWIRE)) {
/* if(end_place_move_copy_zoom()) break;*/ if(end_place_move_copy_zoom()) break;
/*}*/ }
/* end intuitive_interface copy or move */ /* end intuitive_interface copy or move */
if(xctx->ui_state & STARTCOPY && xctx->drag_elements) { if(xctx->ui_state & STARTCOPY && xctx->drag_elements) {