From: Richard Quirk <richard.quirk@gmail.com>
Date: Fri, 20 Jun 2008 14:58:15 +0000 (+0200)
Subject: git-gui: Fix accidental staged state toggle when clicking top pixel row
X-Git-Tag: v1.6.0-rc0~61^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cead78edef6a2f1339f699cd7d656b6834707b94;p=git.git

git-gui: Fix accidental staged state toggle when clicking top pixel row

If a text widget is asked the index at x,y with y == 0 or y == 1 it will
always return 1.0 as the nearest index, regardless of the x position.

This means that clicking the top 2 pixels of the Unstaged/Staged Changes
lists caused the state of the file there to be toggled. This patch
checks that the pixel clicked is greater than 1, so there is less chance
of accidentally staging or unstaging changes.

Signed-off-by: Richard Quirk <richard.quirk@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/git-gui.sh b/git-gui.sh
index 23d7dfec7..980dc0b37 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1797,7 +1797,7 @@ proc toggle_or_diff {w x y} {
 	$ui_index tag remove in_sel 0.0 end
 	$ui_workdir tag remove in_sel 0.0 end
 
-	if {$col == 0} {
+	if {$col == 0 && $y > 1} {
 		set i [expr {$lno-1}]
 		set ll [expr {[llength $file_lists($w)]-1}]