diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-16 03:01:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-16 03:01:44 -0700 |
| commit | 47d45a5ebd5bce543a50546d05e8b92c6971acda (patch) | |
| tree | 9b386fabbcb80dd7993e94a3c189ed21b9b03147 /git-gui/lib/choose_rev.tcl | |
| parent | cdb51a13c3cf4830d499d1138160eacdd2b8aa46 (diff) | |
| parent | 843d6597fbacfae02b8af7d6840992c92d0863f8 (diff) | |
| download | git-47d45a5ebd5bce543a50546d05e8b92c6971acda.tar.gz git-47d45a5ebd5bce543a50546d05e8b92c6971acda.tar.xz | |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui: incremental goto line in blame view
git-gui: clear the goto line input when hiding
git-gui: only accept numbers in the goto-line input
git-gui: search and linenumber input are mutual exclusive in the blame view
git-gui: deal with unknown files when pressing the "Stage Changed" button
git-gui: drop the 'n' and 'Shift-n' bindings from the last patch.
git-gui: Add keyboard shortcuts for search and goto commands in blame view.
git-gui: Enable jumping to a specific line number in blame view.
Fix tooltip display with multiple monitors on windows.
Fix typo: existant->existent
git-gui: updated translator README for current procedures.
git-gui: warn when trying to commit on a detached head
git-gui: Corrected a typo in the Swedish translation of 'Continue'
Diffstat (limited to 'git-gui/lib/choose_rev.tcl')
| -rw-r--r-- | git-gui/lib/choose_rev.tcl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-gui/lib/choose_rev.tcl b/git-gui/lib/choose_rev.tcl index c12d5e169..54c7957a6 100644 --- a/git-gui/lib/choose_rev.tcl +++ b/git-gui/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 |