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

graph UI improvements (no require shift + mouse for global x-axis sliding)

This commit is contained in:
Stefan Frederik 2021-12-26 15:13:57 +01:00
parent 214070bb1c
commit 7a286e5466
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/callback.c
View File

@ -254,7 +254,9 @@ static int waves_callback(int event, int mx, int my, KeySym key, int button, int
cy = (y1 - y2) / (wy2 - wy1); cy = (y1 - y2) / (wy2 - wy1);
dy = y2 - wy1 * cy; dy = y2 - wy1 * cy;
dbg(1, "%g %g %g %g - %d %d\n", wx1, wy1, wx2, wy2, divx, divy); dbg(1, "%g %g %g %g - %d %d\n", wx1, wy1, wx2, wy2, divx, divy);
if(event == MotionNotify && (state & (Button2Mask | Button1Mask) && !(state & ShiftMask) )) { if(event == MotionNotify &&
(state & (Button2Mask | Button1Mask) && !(state & ShiftMask) ) &&
!(bottom || (xctx->ui_state & GRAPHPAN))) {
double delta; double delta;
if(left) { if(left) {
delta = (wy2 - wy1) / divy; delta = (wy2 - wy1) / divy;
@ -489,26 +491,25 @@ static int waves_callback(int event, int mx, int my, KeySym key, int button, int
} }
need_redraw = 1; need_redraw = 1;
} }
else if( ((state & ShiftMask) && event == ButtonPress && (button == Button1)) || else if( ( ( event == ButtonPress && (button == Button1)) ||
((state & ShiftMask) && event == MotionNotify && (state & Button1Mask)) ) { ( event == MotionNotify && (state & Button1Mask)) ) &&
if(bottom || (xctx->ui_state & GRAPHPAN)) { (bottom || (xctx->ui_state & GRAPHPAN)) ) {
double wwx1, wwx2, p, delta, ccx, ddx; double wwx1, wwx2, p, delta, ccx, ddx;
xctx->ui_state |= GRAPHPAN; xctx->ui_state |= GRAPHPAN;
delta = wx2 - wx1; delta = wx2 - wx1;
wwx1 = 0; /* <<<< */ wwx1 = 0; /* <<<< */
wwx2 = get_raw_value(dataset, 0, xctx->npoints[dataset] - 1); wwx2 = get_raw_value(dataset, 0, xctx->npoints[dataset] - 1);
ccx = (x2 - x1) / (wwx2 - wwx1); ccx = (x2 - x1) / (wwx2 - wwx1);
ddx = x1 - wwx1 * cx; ddx = x1 - wwx1 * cx;
p = (xctx->mousex_snap - ddx) / ccx; p = (xctx->mousex_snap - ddx) / ccx;
xx1 = p - delta / 2.0; xx1 = p - delta / 2.0;
xx2 = p + delta / 2.0; xx2 = p + delta / 2.0;
my_snprintf(s, S(s), "%g", xx1); my_snprintf(s, S(s), "%g", xx1);
my_strdup(1442, &xctx->rect[c][n].prop_ptr, subst_token(xctx->rect[c][n].prop_ptr, "x1", s)); my_strdup(1442, &xctx->rect[c][n].prop_ptr, subst_token(xctx->rect[c][n].prop_ptr, "x1", s));
my_snprintf(s, S(s), "%g", xx2); my_snprintf(s, S(s), "%g", xx2);
my_strdup(1443, &xctx->rect[c][n].prop_ptr, subst_token(xctx->rect[c][n].prop_ptr, "x2", s)); my_strdup(1443, &xctx->rect[c][n].prop_ptr, subst_token(xctx->rect[c][n].prop_ptr, "x2", s));
need_redraw = 1; need_redraw = 1;
}
} }
else if(!(state & ShiftMask) && event == ButtonPress && else if(!(state & ShiftMask) && event == ButtonPress &&
(button == Button2 || button == Button1 || button == Button3)) { (button == Button2 || button == Button1 || button == Button3)) {