Skip to content

Commit

Permalink
git-gui: Increase blame viewer usability on MacOS.
Browse files Browse the repository at this point in the history
On MacOS raising a window causes the focus to be transferred
to it -- although it may actually be a bug in the Tcl/Tk port.
When this happens with the blame viewer tooltips, it makes
the interface less usable, because Entry and Leave handlers
on the text view cause the tip to disappear once the mouse
is moved even 1 pixel.

This commit makes the code raise the main window on MacOS
when Tk 8.5 is used. This version seems to properly support
wm transient by making the tip stay on top of the master,
so reraising the master does not cause it to disappear. Thus
the only remaining sign of problems is slight UI flicker
when focus is momentarily transferred to the tip and back.

Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  • Loading branch information
Alexander Gavrilov authored and Shawn O. Pearce committed Dec 5, 2009
1 parent 88520ca commit 1085208
Showing 1 changed file with 15 additions and 1 deletion.
16 changes: 15 additions & 1 deletion lib/blame.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -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 {} {
Expand All @@ -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 {} {
Expand Down

0 comments on commit 1085208

Please sign in to comment.