Merge remote-tracking branch 'supercd/master' into SuperChayan
This commit is contained in:
commit
8dc3cba82c
|
|
@ -3003,7 +3003,7 @@ int rstate; /* (reduced state, without ShiftMask) */
|
|||
if(xctx->ui_state2 & MENUSTARTWIRE) {
|
||||
xctx->ui_state2 &= ~MENUSTARTWIRE;
|
||||
}
|
||||
if(tclgetboolvar("persistent_command") && (xctx->last_command & STARTWIRE)) {
|
||||
if(tclgetboolvar("persistent_command") && (xctx->last_command & STARTWIRE) && cadence_compat) {
|
||||
xctx->last_command &= ~STARTWIRE;
|
||||
if(snap_cursor) draw_snap_cursor(1);
|
||||
}
|
||||
|
|
@ -4519,10 +4519,10 @@ 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) && !(xctx->ui_state & MENUSTART)) {*/
|
||||
/* if(end_place_move_copy_zoom()) break;*/
|
||||
/*}*/
|
||||
else if(state == Button1Mask && xctx->intuitive_interface && !tclgetboolvar("persistent_command")
|
||||
&& (xctx->ui_state & STARTWIRE) && !(xctx->ui_state & MENUSTART)) {
|
||||
if(end_place_move_copy_zoom()) break;
|
||||
}
|
||||
|
||||
/* end intuitive_interface copy or move */
|
||||
if(xctx->ui_state & STARTCOPY && xctx->drag_elements) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue