Merge branch 'master' of 192.168.0.7:/home/tim/gitsrc/magic

Pulling last commit from the server.
This commit is contained in:
Tim Edwards 2021-04-12 13:32:59 -04:00
commit 4aa7e21a64
1 changed files with 2 additions and 2 deletions

View File

@ -1138,10 +1138,10 @@ proc magic::openwrapper {{cell ""} {framename ""}} {
# set. On standard displays, an "M" in the Sans font is usually 10 # set. On standard displays, an "M" in the Sans font is usually 10
# pixels wide, and 22 on high resolution displays, so this maps to # pixels wide, and 22 on high resolution displays, so this maps to
# a scale of 1 on standard displays and a scale of 2 on high resolution # a scale of 1 on standard displays and a scale of 2 on high resolution
# displays. # displays. Make sure scale doesn't go to zero or bad things happen.
if [catch {set Opts(scale)}] { if [catch {set Opts(scale)}] {
set Opts(scale) [expr {int([font measure TkDefaultFont M] / 10)}] set Opts(scale) [expr {max(1, int([font measure TkDefaultFont M] / 10))}]
} }
# Resize the window # Resize the window