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

fix some UI glitches (place text/symbol and aborting operation during move will now delete placed objects)

This commit is contained in:
Stefan Frederik 2021-11-04 15:08:54 +01:00
parent 7490c80a9c
commit 8281c67aed
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/callback.c
View File

@ -57,9 +57,11 @@ void abort_operation(void)
if(xctx->ui_state & STARTMOVE) if(xctx->ui_state & STARTMOVE)
{ {
move_objects(ABORT,0,0,0); move_objects(ABORT,0,0,0);
if(xctx->ui_state & START_SYMPIN) { if(xctx->ui_state & (START_SYMPIN | PLACE_SYMBOL | PLACE_TEXT)) {
delete(1/* to_push_undo */); delete(1/* to_push_undo */);
xctx->ui_state &= ~START_SYMPIN; xctx->ui_state &= ~START_SYMPIN;
xctx->ui_state &= ~PLACE_SYMBOL;
xctx->ui_state &= ~PLACE_TEXT;
} }
return; return;
} }
@ -291,7 +293,7 @@ int callback(int event, int mx, int my, KeySym key,
} }
if(xctx->ui_state & STARTPAN) pan(RUBBER); if(xctx->ui_state & STARTPAN) pan(RUBBER);
if(xctx->ui_state & STARTZOOM) zoom_rectangle(RUBBER); if(xctx->ui_state & STARTZOOM) zoom_rectangle(RUBBER);
if(xctx->ui_state & STARTSELECT && !(xctx->ui_state & PLACE_SYMBOL) && !(xctx->ui_state & STARTPAN2)) { if(xctx->ui_state & STARTSELECT && !(xctx->ui_state & (PLACE_SYMBOL | STARTPAN2 | PLACE_TEXT)) ) {
if( (state & Button1Mask) && (state & Mod1Mask)) { /* 20171026 added unselect by area */ if( (state & Button1Mask) && (state & Mod1Mask)) { /* 20171026 added unselect by area */
select_rect(RUBBER,0); select_rect(RUBBER,0);
} else if(state & Button1Mask) { } else if(state & Button1Mask) {
@ -314,7 +316,7 @@ int callback(int event, int mx, int my, KeySym key,
/* start of a mouse area select */ /* start of a mouse area select */
if(!(xctx->ui_state & STARTPOLYGON) && (state&Button1Mask) && !(xctx->ui_state & STARTWIRE) && if(!(xctx->ui_state & STARTPOLYGON) && (state&Button1Mask) && !(xctx->ui_state & STARTWIRE) &&
!(xctx->ui_state & STARTPAN2) && !(state & Mod1Mask) && !(xctx->ui_state & STARTPAN2) && !(state & Mod1Mask) &&
!(state & ShiftMask) && !(xctx->ui_state & PLACE_SYMBOL)) !(state & ShiftMask) && !(xctx->ui_state & (PLACE_SYMBOL | PLACE_TEXT)))
{ {
static int onetime=0; static int onetime=0;
if(mx != xctx->mx_save || my != xctx->my_save) { if(mx != xctx->mx_save || my != xctx->my_save) {
@ -332,12 +334,12 @@ int callback(int event, int mx, int my, KeySym key,
} }
} }
if((state & Button1Mask) && (state & Mod1Mask) && !(state & ShiftMask) && if((state & Button1Mask) && (state & Mod1Mask) && !(state & ShiftMask) &&
!(xctx->ui_state & STARTPAN2) && !(xctx->ui_state & PLACE_SYMBOL)) { /* 20150927 unselect area */ !(xctx->ui_state & STARTPAN2) && !(xctx->ui_state & (PLACE_SYMBOL | PLACE_TEXT))) { /* 20150927 unselect area */
if( !(xctx->ui_state & STARTSELECT)) { if( !(xctx->ui_state & STARTSELECT)) {
select_rect(START,0); select_rect(START,0);
} }
} }
else if((state&Button1Mask) && (state & ShiftMask) && !(xctx->ui_state & PLACE_SYMBOL) && else if((state&Button1Mask) && (state & ShiftMask) && !(xctx->ui_state & (PLACE_SYMBOL | PLACE_TEXT)) &&
!(xctx->ui_state & STARTPAN2) ) { !(xctx->ui_state & STARTPAN2) ) {
if(mx != xctx->mx_save || my != xctx->my_save) { if(mx != xctx->mx_save || my != xctx->my_save) {
if( !(xctx->ui_state & STARTSELECT)) { if( !(xctx->ui_state & STARTSELECT)) {
@ -725,6 +727,7 @@ int callback(int event, int mx, int my, KeySym key,
{ {
if(xctx->semaphore >= 2) break; if(xctx->semaphore >= 2) break;
xctx->last_command = 0; xctx->last_command = 0;
xctx->ui_state |= PLACE_TEXT;
place_text(0, xctx->mousex_snap, xctx->mousey_snap); /* 1 = draw text 24122002 */ place_text(0, xctx->mousex_snap, xctx->mousey_snap); /* 1 = draw text 24122002 */
xctx->mx_save = mx; xctx->my_save = my; xctx->mx_save = mx; xctx->my_save = my;
xctx->mx_double_save=xctx->mousex_snap; xctx->mx_double_save=xctx->mousex_snap;

5
src/move.c
View File

@ -1018,8 +1018,8 @@ void move_objects(int what, int merge, double dx, double dy)
draw_selection(xctx->gctiled,0); draw_selection(xctx->gctiled,0);
xctx->move_rot=xctx->move_flip=xctx->deltax=xctx->deltay=0; xctx->move_rot=xctx->move_flip=xctx->deltax=xctx->deltay=0;
xctx->ui_state &= ~STARTMOVE; xctx->ui_state &= ~STARTMOVE;
xctx->ui_state &= ~PLACE_SYMBOL;
update_symbol_bboxes(0, 0); update_symbol_bboxes(0, 0);
} }
if(what & RUBBER) /* abort operation */ if(what & RUBBER) /* abort operation */
{ {
@ -1048,11 +1048,12 @@ void move_objects(int what, int merge, double dx, double dy)
bbox(START, 0.0 , 0.0 , 0.0 , 0.0); bbox(START, 0.0 , 0.0 , 0.0 , 0.0);
set_modify(1); set_modify(1);
if( !(xctx->ui_state & (STARTMERGE | PLACE_SYMBOL)) ) { /* no undo push for MERGE ad PLACE, already done before */ if( !(xctx->ui_state & (STARTMERGE | PLACE_SYMBOL | PLACE_TEXT)) ) { /* no undo push for MERGE ad PLACE, already done before */
dbg(1, "move_objects(): push undo state\n"); dbg(1, "move_objects(): push undo state\n");
push_undo(); push_undo();
} }
xctx->ui_state &= ~PLACE_SYMBOL; xctx->ui_state &= ~PLACE_SYMBOL;
xctx->ui_state &= ~PLACE_TEXT;
if(dx!=0.0 || dy!=0.0) { if(dx!=0.0 || dy!=0.0) {
xctx->deltax = dx; xctx->deltax = dx;
xctx->deltay = dy; xctx->deltay = dy;

1
src/xschem.h
View File

@ -200,6 +200,7 @@ extern char win_temp_dir[PATH_MAX];
#define MENUSTARTCIRCLE 2097152 #define MENUSTARTCIRCLE 2097152
#define PLACE_SYMBOL 4194304 /* used in move_objects after place_symbol to avoid storing intermediate undo state */ #define PLACE_SYMBOL 4194304 /* used in move_objects after place_symbol to avoid storing intermediate undo state */
#define START_SYMPIN 8388608 #define START_SYMPIN 8388608
#define PLACE_TEXT 16777216
#define SELECTED 1 /* used in the .sel field for selected objs. */ #define SELECTED 1 /* used in the .sel field for selected objs. */
#define SELECTED1 2 /* first point selected... */ #define SELECTED1 2 /* first point selected... */
#define SELECTED2 4 /* second point selected... */ #define SELECTED2 4 /* second point selected... */