undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  git-gui: Disable native platform text selection in "lists"

Conflicts:

	lib/browser.tcl
This commit is contained in:
Shawn O. Pearce 2007-09-16 23:15:21 -04:00
commit 704396bc2a
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
git-gui.sh
View File

@ -510,6 +510,16 @@ proc tk_optionMenu {w varName args} {
return $m
}
proc rmsel_tag {text} {
$text tag conf sel \
-background [$text cget -background] \
-foreground [$text cget -foreground] \
-borderwidth 0
$text tag conf in_sel -background lightgray
bind $text <Motion> break
return $text
}
######################################################################
##
## find git
@ -2172,8 +2182,8 @@ pack $ui_workdir -side left -fill both -expand 1
.vpane.files add .vpane.files.workdir -sticky nsew
foreach i [list $ui_index $ui_workdir] {
$i tag conf in_diff -background lightgray
$i tag conf in_sel -background lightgray
rmsel_tag $i
$i tag conf in_diff -background [$i tag cget in_sel -background]
}
unset i

2
lib/browser.tcl
View File

@ -47,7 +47,7 @@ constructor new {commit {path {}}} {
-width 70 \
-xscrollcommand [list $w.list.sbx set] \
-yscrollcommand [list $w.list.sby set]
$w_list tag conf in_sel -background lightgray
rmsel_tag $w_list
scrollbar $w.list.sbx -orient h -command [list $w_list xview]
scrollbar $w.list.sby -orient v -command [list $w_list yview]
pack $w.list.sbx -side bottom -fill x

9
lib/choose_font.tcl
View File

@ -62,6 +62,7 @@ constructor pick {path title a_family a_size} {
-width 30 \
-height 10 \
-yscrollcommand [list $w.inner.family.sby set]
rmsel_tag $w_family
scrollbar $w.inner.family.sby -command [list $w_family yview]
pack $w.inner.family.l -side top -fill x
pack $w.inner.family.sby -side right -fill y
@ -95,6 +96,7 @@ constructor pick {path title a_family a_size} {
-relief sunken \
-height 3 \
-width 40
rmsel_tag $w_example
$w_example tag conf example -justify center
$w_example insert end [mc "This is example text.\nIf you like this text, it can be your font."] example
$w_example conf -state disabled
@ -108,11 +110,10 @@ constructor pick {path title a_family a_size} {
$w_family tag conf pick
$w_family tag bind pick <Button-1> [cb _pick_family %x %y]\;break
$w_family tag conf cpck -background lightgray
foreach f $all_families {
set sel [list pick]
if {$f eq $f_family} {
lappend sel cpck
lappend sel in_sel
}
$w_family insert end "$f\n" $sel
}
@ -145,8 +146,8 @@ method _pick_family {x y} {
set i [lindex [split [$w_family index @$x,$y] .] 0]
set n [lindex $all_families [expr {$i - 1}]]
if {$n ne {}} {
$w_family tag remove cpck 0.0 end
$w_family tag add cpck $i.0 [expr {$i + 1}].0
$w_family tag remove in_sel 0.0 end
$w_family tag add in_sel $i.0 [expr {$i + 1}].0
set f_family $n
_update $this
}