diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2019-07-03 20:34:00 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2019-07-03 20:34:00 (GMT) |
| commit | e5c9b14983bc8791d70fd397989587dcf17e8a30 (patch) | |
| tree | b9f1b91a17a599b85a9d5a39723c394243c766d1 /ds9 | |
| parent | 6d3e7f74344f99f0c0840dee67727174fb05218e (diff) | |
| parent | fc87556a1d5397a519d3840b2ca91f54a2245360 (diff) | |
| download | blt-e5c9b14983bc8791d70fd397989587dcf17e8a30.zip blt-e5c9b14983bc8791d70fd397989587dcf17e8a30.tar.gz blt-e5c9b14983bc8791d70fd397989587dcf17e8a30.tar.bz2 | |
Merge branch 'master' into devel
Diffstat (limited to 'ds9')
| -rw-r--r-- | ds9/doc/release/r8.1.html | 1 | ||||
| -rw-r--r-- | ds9/library/ds9.tcl | 17 | ||||
| -rw-r--r-- | ds9/library/markeranalysisplot3d.tcl | 1 |
3 files changed, 16 insertions, 3 deletions
diff --git a/ds9/doc/release/r8.1.html b/ds9/doc/release/r8.1.html index 90e4cc2..bf0a72f 100644 --- a/ds9/doc/release/r8.1.html +++ b/ds9/doc/release/r8.1.html @@ -86,6 +86,7 @@ <li><tt>06.19.2019 PREFS: screen for old pbuttons vars which may have been passed along from previous prefs files before processing the buttons.</tt></li> <li><tt>07.01.2019 SKYBOT: fixed an issue with keyword EXPTIME/EXP_TIME if present.</tt></li> <li><tt>07.01.2019 PLOT3D: simplify code for generating plot3d cursor.</tt></li> +<li><tt>07.03.2019 GUI: lock down geometry at startup so that unneeded configure events are not generated, a problem with recent versions of linux.</tt></li> <li><tt><b>xx.xx.2019 RELEASE version 8.1b2</b></tt></li> </ol> </div> diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl index 5e4b207..61e3bad 100644 --- a/ds9/library/ds9.tcl +++ b/ds9/library/ds9.tcl @@ -578,9 +578,20 @@ after $ds9(msg,timeout) [list ErrorTimer] # ok, we're done set ds9(init) 0 -# major kludge- jump start keyevents for windows +# major kludges switch $ds9(wm) { - x11 - + x11 { + # lock down geometry at statup + # so unneeded configure events are not generated + # a problem with recent versions of linux + wm geometry $ds9(top) "[winfo width $ds9(top)]x[winfo height $ds9(top)]" + } aqua {} - win32 {event generate $ds9(canvas) <Tab> -x 0 -y 0} + win32 { + # jump start keyevents for windows + event generate $ds9(canvas) <Tab> -x 0 -y 0 + } } + + + diff --git a/ds9/library/markeranalysisplot3d.tcl b/ds9/library/markeranalysisplot3d.tcl index 514b621..ad9813d 100644 --- a/ds9/library/markeranalysisplot3d.tcl +++ b/ds9/library/markeranalysisplot3d.tcl @@ -168,6 +168,7 @@ proc MarkerAnalysisPlot3dCB {frame id} { set vvar(markerslice) [$vvar(graph) marker create line -element bar1 \ -outline cyan -linewidth 2 \ -bindtags [list slice]] + $vvar(graph) configure -halo 10 $vvar(graph) marker bind slice <B1-Motion> \ [list MarkerAnalysisPlot3dMotion $vvarname %x %y] |