Merge branch 'master' into SuperChayan
This commit is contained in:
commit
917d0b247d
|
|
@ -2743,7 +2743,7 @@ void calc_drawing_bbox(xRect *boundbox, int selected)
|
|||
double longest_line;
|
||||
if(selected == 1 && !xctx->text[i].sel) continue;
|
||||
|
||||
if(!xctx->show_hidden_texts && xctx->text[i].flags & (HIDE_TEXT | HIDE_TEXT_INSTANTIATED)) continue;
|
||||
if(!xctx->show_hidden_texts && xctx->text[i].flags & (HIDE_TEXT /* | HIDE_TEXT_INSTANTIATED */)) continue;
|
||||
#if HAS_CAIRO==1
|
||||
customfont = set_text_custom_font(&xctx->text[i]);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -5093,10 +5093,13 @@ proc insert_symbol {{paths {}} {maxdepth -1} {ext {.*}} {action {symbol}}} {
|
|||
"
|
||||
bind .ins.center.leftdir.l <<ListboxSelect>> "insert_symbol_filelist"
|
||||
bind .ins.center.left.l <<ListboxSelect>> "insert_symbol_select_preview"
|
||||
bind .ins.center.left.l <KeyPress-Return> "
|
||||
bind .ins.center.left.l <KeyPress-Return> {
|
||||
if {$insert_symbol(action) eq {load}} {
|
||||
.ins.bottom.load invoke
|
||||
}
|
||||
xschem preview_window close .ins.center.right {}
|
||||
destroy .ins
|
||||
"
|
||||
}
|
||||
bind .ins.center.left.l <Enter> "
|
||||
if { \[xschem get ui_state\] & 8192 } {
|
||||
xschem abort_operation
|
||||
|
|
|
|||
Loading…
Reference in New Issue