From: Pat Thoyts Date: Mon, 11 Jul 2011 12:55:38 +0000 (+0100) Subject: Fix tooltip display with multiple monitors on windows. X-Git-Tag: gitgui-0.15.0~14 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=768e300a508d0e9e685929082a99c885ff384ffc;p=git.git Fix tooltip display with multiple monitors on windows. On Windows the position of a window may be negative on a monitor to the left of the primary display. A plus sign is used as the separator between the width and height and the positional parts of the geometry so always include the plus sign even for negative positions on this platform. Signed-off-by: Pat Thoyts --- diff --git a/lib/blame.tcl b/lib/blame.tcl index 61e358f96..1f2977d5b 100644 --- a/lib/blame.tcl +++ b/lib/blame.tcl @@ -1298,9 +1298,9 @@ method _position_tooltip {} { set pos_y [expr {[winfo pointery .] + 10}] set g "${req_w}x${req_h}" - if {$pos_x >= 0} {append g +} + if {[tk windowingsystem] eq "win32" || $pos_x >= 0} {append g +} append g $pos_x - if {$pos_y >= 0} {append g +} + if {[tk windowingsystem] eq "win32" || $pos_y >= 0} {append g +} append g $pos_y wm geometry $tooltip_wm $g diff --git a/lib/choose_rev.tcl b/lib/choose_rev.tcl index c12d5e169..54c7957a6 100644 --- a/lib/choose_rev.tcl +++ b/lib/choose_rev.tcl @@ -610,9 +610,9 @@ method _position_tooltip {} { set pos_y [expr {[winfo pointery .] + 10}] set g "${req_w}x${req_h}" - if {$pos_x >= 0} {append g +} + if {[tk windowingsystem] eq "win32" || $pos_x >= 0} {append g +} append g $pos_x - if {$pos_y >= 0} {append g +} + if {[tk windowingsystem] eq "win32" || $pos_y >= 0} {append g +} append g $pos_y wm geometry $tooltip_wm $g