From: Richard Quirk <richard.quirk@gmail.com>
To: git@vger.kernel.org
Cc: spearce@spearce.org, Richard Quirk <richard.quirk@gmail.com>
Subject: [PATCH] git-gui: Fix accidental staged state toggle when clicking top pixel row
Date: Fri, 20 Jun 2008 16:58:15 +0200 [thread overview]
Message-ID: <1213973895-10264-1-git-send-email-richard.quirk@gmail.com> (raw)
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>
---
To test the unpatched changes, make a change in a git-controlled repo and run
git-gui. Click the Unstaged Changes list away from the first column, but near
(within 1 pixel) to the pink header part. The file underneath is staged, rather
surprisingly. Similarly, for staged files click a pixel or 2 underneath the
green Staged Changes header and the changes are unstaged, even if the first
column is not clicked.
This change looks like a hack - but I'm pretty sure it's a bug in the Tk text
widget that's causing the strange behaviour. I couldn't see any other way to
fix this accidental (un)staging, which seems to get me at least once a day
lately.
git-gui.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-gui.sh b/git-gui.sh
index 23d7dfe..980dc0b 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}]
--
1.5.6.9.g26943
next reply other threads:[~2008-06-20 14:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-20 14:58 Richard Quirk [this message]
2008-06-20 15:26 ` [PATCH] git-gui: Fix accidental staged state toggle when clicking top pixel row Johannes Sixt
2008-06-21 3:21 ` Shawn O. Pearce
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1213973895-10264-1-git-send-email-richard.quirk@gmail.com \
--to=richard.quirk@gmail.com \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).