merge from master

This commit is contained in:
stefan schippers 2025-03-14 16:40:33 +01:00
commit c89915340d
2 changed files with 7 additions and 8 deletions

View File

@ -3764,12 +3764,16 @@ static void handle_key_press(int event, KeySym key, int state, int rstate, int m
break;
case ' ':
if(xctx->ui_state & STARTWIRE) { /* & instead of == 20190409 */
if(xctx->ui_state & STARTMOVE) {
draw_selection(xctx->gctiled,0);
xctx->manhattan_lines++;
xctx->manhattan_lines %=3;
draw_selection(xctx->gc[SELLAYER], 0);
} else if(xctx->ui_state & STARTWIRE) { /* & instead of == 20190409 */
new_wire(RUBBER|CLEAR, xctx->mousex_snap, xctx->mousey_snap);
xctx->manhattan_lines++;
xctx->manhattan_lines %=3;
new_wire(RUBBER, xctx->mousex_snap, xctx->mousey_snap);
} else if(xctx->ui_state & STARTLINE) {
new_line(RUBBER|CLEAR, xctx->mousex_snap, xctx->mousey_snap);
xctx->manhattan_lines++;

View File

@ -8736,17 +8736,12 @@ proc build_widgets { {topwin {} } } {
-variable intuitive_interface -selectcolor $selectcolor \
-command {xschem set intuitive_interface $intuitive_interface}
$topwin.menubar.option add checkbutton -label "Draw crosshair" \
-variable draw_crosshair -selectcolor $selectcolor -accelerator {Alt-X}
$topwin.menubar.option add checkbutton -label "Draw persistent snap cursor" -variable snap_cursor \
-selectcolor $selectcolor -accelerator {Alt-Z}
$topwin.menubar.option add cascade -label "Crosshair" \
-menu $topwin.menubar.option.crosshair
menu $topwin.menubar.option.crosshair -tearoff 0
$topwin.menubar.option.crosshair add checkbutton -label "Draw snap cursor" \
-variable snap_cursor -selectcolor $selectcolor
-variable snap_cursor -selectcolor $selectcolor -accelerator {Alt-Z}
$topwin.menubar.option.crosshair add checkbutton -label "Draw crosshair" \
-variable draw_crosshair -selectcolor $selectcolor -accelerator {Alt-X}
$topwin.menubar.option.crosshair add command -label "Crosshair size" \