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

various fixes for intuitive_interface / drag_elements

This commit is contained in:
Stefan Schippers 2024-03-02 16:28:22 +01:00
parent 825c671660
commit c49fd0bfc9
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/callback.c
View File

@ -3242,6 +3242,7 @@ int rstate; /* (reduced state, without ShiftMask) */
xctx->drag_elements = 0;
if(sel.type && xctx->intuitive_interface && xctx->lastsel >= 1 &&
!(xctx->lastsel == 1 && xctx->sel_array[0].type==POLYGON) ) {
xctx->push_undo();
xctx->drag_elements = 1;
if( state == ControlMask && !tclgetboolvar("enable_stretch")) {

9
src/move.c
View File

@ -927,9 +927,10 @@ void move_objects(int what, int merge, double dx, double dy)
{
int firsti, firstw;
if(xctx->connect_by_kissing == 2) xctx->connect_by_kissing = 0;
/* no undo push for MERGE ad PLACE and polygon point drag, already done before */
if(!xctx->poly_point_selected && !xctx->kissing &&
if(!xctx->poly_point_selected && !xctx->kissing && !xctx->drag_elements &&
!(xctx->ui_state & (STARTMERGE | PLACE_SYMBOL | PLACE_TEXT)) ) {
dbg(1, "move_objects(END): push undo state\n");
xctx->push_undo();
@ -945,9 +946,13 @@ void move_objects(int what, int merge, double dx, double dy)
xctx->deltax = dx;
xctx->deltay = dy;
}
/* calculate moving symbols bboxes before actually doing the move */
firsti = firstw = 1;
/* button released after clicking elements, without moving... do nothing */
if(xctx->drag_elements && xctx->deltax==0 && xctx->deltay == 0) {
xctx->ui_state &= ~STARTMOVE;
return;
}
draw_selection(xctx->gctiled,0);
update_symbol_bboxes(0, 0);
for(k=0;k<cadlayers; ++k)