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

fix unrestored bbox coordinates in draw_selection()

This commit is contained in:
stefan schippers 2023-10-28 01:03:21 +02:00
parent b965fb0ba4
commit 8b784d01d9
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/draw.c
View File

@ -4132,7 +4132,7 @@ void MyXCopyAreaDouble(Display* display, Drawable src, Drawable dest, GC gc,
width = (unsigned int)isx2 - (unsigned int)isx1; width = (unsigned int)isx2 - (unsigned int)isx1;
height = (unsigned int)isy2 - (unsigned int)isy1; height = (unsigned int)isy2 - (unsigned int)isy1;
dbg(1, "%g %g %g %g --> %g %g\n", isx1, isy1, isx2, isy2, idx1, idy1);
#if !defined(__unix__) #if !defined(__unix__)
XCopyArea(display, src, dest, gc, (int)isx1, (int)isy1, width, height, (int)idx1, (int)idy1); XCopyArea(display, src, dest, gc, (int)isx1, (int)isy1, width, height, (int)idx1, (int)idy1);
#if HAS_CAIRO==1 #if HAS_CAIRO==1

10
src/move.c
View File

@ -195,7 +195,6 @@ void draw_selection(GC g, int interruptable)
#if HAS_CAIRO==1 #if HAS_CAIRO==1
int customfont; int customfont;
#endif #endif
dbg(1,"draw_selection %s\n", g == xctx->gctiled ? "gctiled" : "gcselect"); dbg(1,"draw_selection %s\n", g == xctx->gctiled ? "gctiled" : "gcselect");
if(g != xctx->gctiled) xctx->movelastsel = xctx->lastsel; if(g != xctx->gctiled) xctx->movelastsel = xctx->lastsel;
for(i=0;i<xctx->movelastsel; ++i) for(i=0;i<xctx->movelastsel; ++i)
@ -447,6 +446,7 @@ void draw_selection(GC g, int interruptable)
if((fix_broken_tiled_fill || !_unix) && g == xctx->gctiled) { if((fix_broken_tiled_fill || !_unix) && g == xctx->gctiled) {
short save_flip, save_rot; short save_flip, save_rot;
double save_x0, save_y0; double save_x0, save_y0;
double save_x1, save_y1, save_x2, save_y2;
double x1, y1, x2, y2; double x1, y1, x2, y2;
/* Can be made simpler ? */ /* Can be made simpler ? */
@ -456,6 +456,10 @@ void draw_selection(GC g, int interruptable)
save_rot = xctx->inst[n].rot; save_rot = xctx->inst[n].rot;
save_x0 = xctx->inst[n].x0; save_x0 = xctx->inst[n].x0;
save_y0 = xctx->inst[n].y0; save_y0 = xctx->inst[n].y0;
save_x1 = xctx->inst[n].xx1;
save_y1 = xctx->inst[n].yy1;
save_x2 = xctx->inst[n].xx2;
save_y2 = xctx->inst[n].yy2;
xctx->inst[n].flip = xctx->move_flip ^ xctx->inst[n].flip; xctx->inst[n].flip = xctx->move_flip ^ xctx->inst[n].flip;
xctx->inst[n].rot = (xctx->inst[n].rot + xctx->move_rot) & 0x3; xctx->inst[n].rot = (xctx->inst[n].rot + xctx->move_rot) & 0x3;
xctx->inst[n].x0 = xctx->rx1+xctx->deltax; xctx->inst[n].x0 = xctx->rx1+xctx->deltax;
@ -465,6 +469,10 @@ void draw_selection(GC g, int interruptable)
xctx->inst[n].flip = save_flip; xctx->inst[n].flip = save_flip;
xctx->inst[n].x0 = save_x0; xctx->inst[n].x0 = save_x0;
xctx->inst[n].y0 = save_y0; xctx->inst[n].y0 = save_y0;
xctx->inst[n].xx1 = save_x1;
xctx->inst[n].yy1 = save_y1;
xctx->inst[n].xx2 = save_x2;
xctx->inst[n].yy2 = save_y2;
MyXCopyAreaDouble(display, xctx->save_pixmap, xctx->window, xctx->gc[0], MyXCopyAreaDouble(display, xctx->save_pixmap, xctx->window, xctx->gc[0],
x1, y1, x2, y2, x1, y1, x1, y1, x2, y2, x1, y1,