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

Merge branch 'master' into magic-8.2

This commit is contained in:
Tim Edwards 2019-11-24 03:00:11 -05:00
parent 2019a8a665 7373d55c55
commit 53c4cb5b1b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tcltk/toolkit.tcl
View File

@ -568,12 +568,16 @@ proc magic::add_dependency {callback gencell_type library args} {
#----------------------------------------------------------
proc magic::update_dialog {callback pname gencell_type library} {
set pdefaults [${library}::${gencell_type}_defaults]
set parameters [dict merge $pdefaults [magic::gencell_getparams]]
if {[dict exists $parameters gencell]} {
# Setting special parameter "gencell" forces the gencell to change type
set gencell_type [dict get $parameters gencell]
set pdefaults [${library}::${gencell_type}_defaults]
set parameters [dict merge $pdefaults [magic::gencell_getparams]]
}
set pdefaults [${library}::${gencell_type}_defaults]
set parameters [dict merge $pdefaults [magic::gencell_getparams]]
if {$callback != {}} {
set parameters [$callback $pname $parameters]
}