summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2007-11-21 16:29:06 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2007-11-21 16:29:06 (GMT)
commit76a71f6e2940d41ed2da7ef6035676f36d7fed58 (patch)
tree56bc4f90c118934917c644f77d5e8fabcf757f28
parent815c7d7ce6956950ce2a9549e883912698525f8a (diff)
downloadtk-76a71f6e2940d41ed2da7ef6035676f36d7fed58.zip
tk-76a71f6e2940d41ed2da7ef6035676f36d7fed58.tar.gz
tk-76a71f6e2940d41ed2da7ef6035676f36d7fed58.tar.bz2
Improve theming of Unix dialogs
-rw-r--r--ChangeLog4
-rw-r--r--library/msgbox.tcl4
-rw-r--r--library/tkfbox.tcl13
3 files changed, 14 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index f373c4d..dd84772 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-21 Donal K. Fellows <donal.k.fellows@manchester.ac.uk>
+
+ * library/tkfbox.tcl: Better theming in the file list area.
+
2007-11-19 Don Porter <dgp@users.sourceforge.net>
*** 8.5b3 TAGGED FOR RELEASE ***
diff --git a/library/msgbox.tcl b/library/msgbox.tcl
index 74d2bef..26775b3 100644
--- a/library/msgbox.tcl
+++ b/library/msgbox.tcl
@@ -3,7 +3,7 @@
# Implements messageboxes for platforms that do not have native
# messagebox support.
#
-# RCS: @(#) $Id: msgbox.tcl,v 1.33 2007/11/02 13:16:38 dkf Exp $
+# RCS: @(#) $Id: msgbox.tcl,v 1.34 2007/11/21 16:29:08 dkf Exp $
#
# Copyright (c) 1994-1997 Sun Microsystems, Inc.
#
@@ -247,7 +247,7 @@ proc ::tk::MessageBox {args} {
}
# There is only one background colour for the whole dialog
- set bg [ttk::style lookup $::ttk::currentTheme -background]
+ set bg [ttk::style lookup . -background]
# 3. Create the top-level window and divide it into top
# and bottom parts.
diff --git a/library/tkfbox.tcl b/library/tkfbox.tcl
index 85065cb..51c7d9c 100644
--- a/library/tkfbox.tcl
+++ b/library/tkfbox.tcl
@@ -11,7 +11,7 @@
# files by clicking on the file icons or by entering a filename
# in the "Filename:" entry.
#
-# RCS: @(#) $Id: tkfbox.tcl,v 1.65 2007/11/02 16:14:57 dkf Exp $
+# RCS: @(#) $Id: tkfbox.tcl,v 1.66 2007/11/21 16:29:08 dkf Exp $
#
# Copyright (c) 1994-1998 Sun Microsystems, Inc.
#
@@ -169,6 +169,10 @@ proc ::tk::IconList_DrawSelection {w} {
upvar ::tk::$w:itemList itemList
$data(canvas) delete selection
+ $data(canvas) itemconfigure selectionText -fill black
+ $data(canvas) dtag selectionText
+ set cbg [ttk::style lookup TEntry -selectbackground focus]
+ set cfg [ttk::style lookup TEntry -selectforeground focus]
foreach item $data(selection) {
set rTag [lindex [lindex $data(list) $item] 2]
foreach {iTag tTag text serial} $itemList($rTag) {
@@ -176,8 +180,9 @@ proc ::tk::IconList_DrawSelection {w} {
}
set bbox [$data(canvas) bbox $tTag]
- $data(canvas) create rect $bbox -fill \#a0a0ff -outline \#a0a0ff \
+ $data(canvas) create rect $bbox -fill $cbg -outline $cbg \
-tags selection
+ $data(canvas) itemconfigure $tTag -fill $cfg -tags selectionText
}
$data(canvas) lower selection
return
@@ -226,9 +231,7 @@ proc ::tk::IconList_Create {w} {
set data(sbar) [ttk::scrollbar $w.cHull.sbar -orient horizontal -takefocus 0]
catch {$data(sbar) configure -highlightthickness 0}
set data(canvas) [canvas $w.cHull.canvas -highlightthick 0 \
- -width 400 -height 120 -takefocus 1]
- $data(canvas) configure -background \
- [ttk::style lookup $::ttk::currentTheme -background]
+ -width 400 -height 120 -takefocus 1 -background white]
pack $data(sbar) -side bottom -fill x -padx 2 -in $w.cHull -pady {0 2}
pack $data(canvas) -expand yes -fill both -padx 2 -pady {2 0}
pack $w.cHull -expand yes -fill both -ipadx 2 -ipady 2