From 8a8e665cdcfc6a2f49b165d715df4d3eb654349d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 20 Oct 2022 15:11:35 +0000
Subject: Some last-minute changes by Patrick May

---
 library/iconlist.tcl     | 2 +-
 library/palette.tcl      | 8 ++++++--
 library/ttk/defaults.tcl | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/library/iconlist.tcl b/library/iconlist.tcl
index 0b65464..f9205ba 100644
--- a/library/iconlist.tcl
+++ b/library/iconlist.tcl
@@ -405,7 +405,7 @@ package require tk
 	set sbar [ttk::scrollbar $hull.sbar -orient horizontal -takefocus 0]
 	catch {$sbar configure -highlightthickness 0}
 	set canvas [canvas $hull.canvas -highlightthick 0 -takefocus 1 \
-			-width 400 -height 120\
+			-width 400 -height 120 \
 			-background [ttk::style lookup Treeview -background {} white]]
 	pack $sbar -side bottom -fill x -padx 2 -pady {0 2}
 	pack $canvas -expand yes -fill both -padx 2 -pady {2 0}
diff --git a/library/palette.tcl b/library/palette.tcl
index c2ba4e0..c9b1208 100644
--- a/library/palette.tcl
+++ b/library/palette.tcl
@@ -140,8 +140,9 @@ proc ::tk_setPalette {args} {
 
     array set ::tk::Palette [array get new]
 
-    # Update the 'default' ttk theme in order to apply the
-    # new palette to the ttk widgets.
+    # Update the 'default' ttk theme with the new palette,
+    # and then set 'default' as the current ttk theme,
+    # in order to apply the new palette to the ttk widgets.
 
     foreach option [array names new] {
 	if {[info exists ttk::theme::default::colorOptionLookup($option)]} {
@@ -151,6 +152,9 @@ proc ::tk_setPalette {args} {
 	}
     }
     ttk::theme::default::reconfigureDefaultTheme
+    ttk::setTheme default
+
+    return
 }
 
 # ::tk::RecolorTree --
diff --git a/library/ttk/defaults.tcl b/library/ttk/defaults.tcl
index b85430e..3a4dc23 100644
--- a/library/ttk/defaults.tcl
+++ b/library/ttk/defaults.tcl
@@ -138,12 +138,12 @@ proc ttk::theme::default::reconfigureDefaultTheme {} {
 	ttk::style configure TCombobox -arrowsize 12 -padding 1
 	ttk::style map TCombobox -fieldbackground \
 	    [list readonly $colors(-frame) disabled $colors(-frame)] \
-	    -arrowcolor [list disabled $colors(-disabledfg)]
+	    -arrowcolor [list disabled $colors(-disabledfg) !disabled $colors(-text)]
 
 	ttk::style configure TSpinbox -arrowsize 10 -padding {2 0 10 0}
 	ttk::style map TSpinbox -fieldbackground \
 	    [list readonly $colors(-frame) disabled $colors(-frame)] \
-	    -arrowcolor [list disabled $colors(-disabledfg)]
+	    -arrowcolor [list disabled $colors(-disabledfg) !disabled $colors(-text)]
 
 	ttk::style configure TLabelframe \
 	    -relief groove -borderwidth 2
@@ -151,7 +151,7 @@ proc ttk::theme::default::reconfigureDefaultTheme {} {
 	ttk::style configure TScrollbar \
 	    -width 12 -arrowsize 12
 	ttk::style map TScrollbar \
-	    -arrowcolor [list disabled $colors(-disabledfg)]
+	    -arrowcolor [list disabled $colors(-disabledfg) !disabled $colors(-text)]
 
 	ttk::style configure TScale \
 	    -sliderrelief raised
-- 
cgit v0.12