diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2003-10-22 15:24:24 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2003-10-22 15:24:24 (GMT) |
| commit | 2e19f8728383b4729ceb99a480b83249d4ef2290 (patch) | |
| tree | 8554e1a80dc834062ff84d86fe4fc501a7cf030a | |
| parent | 4c4b8b6c503a4f946ae7b5c6f027f26f61c3c923 (diff) | |
| download | tk-2e19f8728383b4729ceb99a480b83249d4ef2290.zip tk-2e19f8728383b4729ceb99a480b83249d4ef2290.tar.gz tk-2e19f8728383b4729ceb99a480b83249d4ef2290.tar.bz2 | |
Constrain tk_dialg to be sensibly sized and placed. [Bug 827535]
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | library/dialog.tcl | 12 |
2 files changed, 16 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2003-10-22 Donal K. Fellows <fellowsd@cs.man.ac.uk> + + * library/dialog.tcl (tk_dialog): Constrain the dialog to be + fairly sensibly sized and placed. [Bug 827535] + 2003-10-15 Joe English <jenglish@users.sourceforge.net> * unix/tkUnixWm.c, tests/unixWm.test: Delete WM_TRANSIENT_FOR property instead of setting it to None when making a window diff --git a/library/dialog.tcl b/library/dialog.tcl index 2eb425f..398a494 100644 --- a/library/dialog.tcl +++ b/library/dialog.tcl @@ -3,7 +3,7 @@ # This file defines the procedure tk_dialog, which creates a dialog # box containing a bitmap, a message, and one or more buttons. # -# RCS: @(#) $Id: dialog.tcl,v 1.14 2002/08/31 06:12:28 das Exp $ +# RCS: @(#) $Id: dialog.tcl,v 1.15 2003/10/22 15:24:24 dkf Exp $ # # Copyright (c) 1992-1993 The Regents of the University of California. # Copyright (c) 1994-1997 Sun Microsystems, Inc. @@ -155,6 +155,16 @@ proc ::tk_dialog {w title text bitmap default args} { - [winfo vrootx [winfo parent $w]]}] set y [expr {[winfo screenheight $w]/2 - [winfo reqheight $w]/2 \ - [winfo vrooty [winfo parent $w]]}] + # Make sure that the window is on the screen and set the maximum + # size of the window is the size of the screen. That'll let things + # fail fairly gracefully when very large messages are used. [Bug 827535] + if {$x < 0} { + set x 0 + } + if {$y < 0} { + set y 0 + } + wm maxsize $w [winfo screenwidth $w] [winfo screenheight $w] wm geom $w +$x+$y wm deiconify $w |