summaryrefslogtreecommitdiff
path: root/git-gui/lib/blame.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-09 23:38:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-12-09 23:38:51 (GMT)
commit529f8c6ea6c13d85178d4ed10ed60ed8fd6f6c19 (patch)
tree4d4f9f8a8de0c0a3bc618873fc91d399dd1a712d /git-gui/lib/blame.tcl
parent47344eee9b980a7cf2a08d040ff3dd38c6cd82ec (diff)
parent60204ddb99187dd329000864a618e57742372d74 (diff)
downloadgit-529f8c6ea6c13d85178d4ed10ed60ed8fd6f6c19.zip
git-529f8c6ea6c13d85178d4ed10ed60ed8fd6f6c19.tar.gz
git-529f8c6ea6c13d85178d4ed10ed60ed8fd6f6c19.tar.bz2
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui: git-gui: suppress RenderBadPicture X error caused by Tk bug git-gui: Increase blame viewer usability on MacOS. git-gui: search 4 directories to improve statistic of gc hint git gui: make current branch default in "remote delete branch" merge check
Diffstat (limited to 'git-gui/lib/blame.tcl')
-rw-r--r--git-gui/lib/blame.tcl16
1 files changed, 15 insertions, 1 deletions
diff --git a/git-gui/lib/blame.tcl b/git-gui/lib/blame.tcl
index 1f3b08f..8525b79 100644
--- a/git-gui/lib/blame.tcl
+++ b/git-gui/lib/blame.tcl
@@ -1245,6 +1245,18 @@ method _open_tooltip {cur_w} {
$tooltip_t conf -state disabled
_position_tooltip $this
+
+ # On MacOS raising a window causes it to acquire focus.
+ # Tk 8.5 on MacOS seems to properly support wm transient,
+ # so we can safely counter the effect there.
+ if {$::have_tk85 && [is_MacOSX]} {
+ update
+ if {$w eq {}} {
+ raise .
+ } else {
+ raise $w
+ }
+ }
}
method _position_tooltip {} {
@@ -1268,7 +1280,9 @@ method _position_tooltip {} {
append g $pos_y
wm geometry $tooltip_wm $g
- raise $tooltip_wm
+ if {![is_MacOSX]} {
+ raise $tooltip_wm
+ }
}
method _hide_tooltip {} {