summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-09-17 03:15:21 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-09-17 03:15:21 (GMT)
commit704396bc2a13f8843689d3fab2211a0b2f364652 (patch)
tree809b6b31f30daaf27fd1080d0819a0fd0dd5c1d1 /lib
parent31bb1d1b2d1e893836b0d2b091fed9e39ee84853 (diff)
parent3849bfba84fb5b0e9d46920f62105b4e1dd97e63 (diff)
downloadgit-704396bc2a13f8843689d3fab2211a0b2f364652.zip
git-704396bc2a13f8843689d3fab2211a0b2f364652.tar.gz
git-704396bc2a13f8843689d3fab2211a0b2f364652.tar.bz2
Merge branch 'maint'
* maint: git-gui: Disable native platform text selection in "lists" Conflicts: lib/browser.tcl
Diffstat (limited to 'lib')
-rw-r--r--lib/browser.tcl2
-rw-r--r--lib/choose_font.tcl9
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/browser.tcl b/lib/browser.tcl
index 3ba5c3a..53d5a62 100644
--- a/lib/browser.tcl
+++ b/lib/browser.tcl
@@ -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
diff --git a/lib/choose_font.tcl b/lib/choose_font.tcl
index b69215c..0c4051b 100644
--- a/lib/choose_font.tcl
+++ b/lib/choose_font.tcl
@@ -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
}