mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://repo.or.cz/git-gui

Browse Source 
* 'master' of git://repo.or.cz/git-gui:
  git-gui: Added support for OS X right click
  git-gui: Avoid Tcl error in popup menu on diff viewer
This commit is contained in:
Junio C Hamano
2007-08-19 11:38:15 -07:00
parent f16eb1f6a3 51b8c5021a
commit 63f328290a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
git-gui/git-gui.sh
View File

@ -1348,6 +1348,9 @@ unset i
proc bind_button3 {w cmd} { proc bind_button3 {w cmd} {
bind $w <Any-Button-3> $cmd bind $w <Any-Button-3> $cmd
if {[is_MacOSX]} { if {[is_MacOSX]} {
# Mac OS X sends Button-2 on right click through three-button mouse,
# or through trackpad right-clicking (two-finger touch + click).
bind $w <Any-Button-2> $cmd
bind $w <Control-Button-1> $cmd bind $w <Control-Button-1> $cmd
} }
} }
@ -2407,13 +2410,15 @@ $ctxm add separator
$ctxm add command -label {Options...} \ $ctxm add command -label {Options...} \
-command do_options -command do_options
proc popup_diff_menu {ctxm x y X Y} { proc popup_diff_menu {ctxm x y X Y} {
global current_diff_path
set ::cursorX $x set ::cursorX $x
set ::cursorY $y set ::cursorY $y
if {$::ui_index eq $::current_diff_side} { if {$::ui_index eq $::current_diff_side} {
$ctxm entryconf $::ui_diff_applyhunk \ $ctxm entryconf $::ui_diff_applyhunk \
-state normal \ -state normal \
-label {Unstage Hunk From Commit} -label {Unstage Hunk From Commit}
} elseif {{_O} eq [lindex $::file_states($::current_diff_path) 0]} { } elseif {![info exists file_states($current_diff_path)]
|| {_O} eq [lindex $file_states($::current_diff_path) 0]} {
$ctxm entryconf $::ui_diff_applyhunk \ $ctxm entryconf $::ui_diff_applyhunk \
-state disabled \ -state disabled \
-label {Stage Hunk For Commit} -label {Stage Hunk For Commit}