Make sure that [tk scaling] will be taken into account when creating the images.

Author: csaba

doc/ttk_spinbox.n

@@ -135,7 +135,9 @@ Besides the standard \fBTSpinbox\fP layout with small arrow buttons, in
 which the up arrow is placed above the down arrow, \fBttk::spinbox\fP
 widgets support the \fBWide.TSpinbox\fP style, whose up and down arrows
 are of a more user-friendly size and in which the up arrow is placed to
-the right of the down arrow.
+the right of the down arrow.  The size of these arrows depends on the
+display's scaling level and Tk's scaling factor given by \fB[tk scaling]\fP
+at the time the first themed spinbox widget is created.
 .SH "SEE ALSO"
 ttk::widget(n), ttk::entry(n), spinbox(n)
 .SH KEYWORDS

doc/ttk_toggleswitch.n

@@ -17,8 +17,9 @@ ttk::toggleswitch \- Create and manipulate a toggleswitch widget
 A \fBttk::toggleswitch\fR widget is used to show or change a binary setting.
 It consists of a horizontal \fItrough\fR (a fully rounded filled rectangle)
 and a \fIslider\fR (a filled circle contained in the trough).  Their
-dimensions depend on the display's scaling level, the current theme, and the
-value of the \fB-size\fR configuration option.
+dimensions depend on the value of the \fB-size\fR configuration option, the
+current theme, the display's scaling level, and Tk's scaling factor given by
+\fB[tk scaling]\fR at the time the first toggleswitch widget is created.
 .PP
 Just like a light switch, a toggleswitch widget can have one of two possible
 \fIswitch state\fRs: on or off.  In the on state the slider is placed at the

generic/ttk/ttkEntry.c

@@ -2025,6 +2025,17 @@ static void
 SpinboxInitialize(Tcl_Interp *interp, void *recordPtr)
 {
     Spinbox *sb = (Spinbox *)recordPtr;
+
+    /*
+     * Create the WideSpinbox.uparrow and WideSpinbox.downarrow
+     * elements for the Wide.TSpinbox style if necessary
+     */
+    int code = Tcl_EvalEx(interp, "ttk::wideSpinbox::CondMakeElements",
+	    TCL_INDEX_NONE, TCL_EVAL_GLOBAL);
+    if (code != TCL_OK) {
+	Tcl_BackgroundException(interp, code);
+    }
+
     TtkTrackElementState(&sb->core);
     EntryInitialize(interp, recordPtr);
 }

library/ttk/elements.tcl

@@ -104,8 +104,6 @@ proc ttk::toggleswitch::IsColorLight color {
     return [expr {5 * ($g >> 8) + 2 * ($r >> 8) + ($b >> 8) > 8 * 192}]
 }
 
-interp alias {} ttk::toggleswitch::CreateImg \
-	     {} image create photo -format $::tk::svgFmt
 interp alias {} ttk::toggleswitch::CreateElem {} ttk::style element create
 
 namespace eval ttk::toggleswitch {
@@ -951,9 +949,6 @@ proc ttk::toggleswitch::UpdateElements_aqua {} {
     }
 }
 
-# Public procedures
-# =================
-
 #------------------------------------------------------------------------------
 # ttk::toggleswitch::CreateElements
 #
@@ -1040,6 +1035,9 @@ proc ttk::toggleswitch::CreateElements {} {
     }
 }
 
+# Public procedures
+# =================
+
 #------------------------------------------------------------------------------
 # ttk::toggleswitch::CondMakeElements
 #
@@ -1050,6 +1048,12 @@ proc ttk::toggleswitch::CreateElements {} {
 proc ttk::toggleswitch::CondMakeElements {} {
     variable madeElements
     if {!$madeElements} {
+	# If Tk's scaling factor was changed via "tk scaling"
+	# then $::tk::svgFmt now has the updated value.
+
+	interp alias {} ::ttk::toggleswitch::CreateImg \
+		     {} image create photo -format $::tk::svgFmt
+
 	CreateElements
 	set madeElements 1
     }

library/ttk/wideSpinbox.tcl

@@ -9,14 +9,12 @@
 #
 # Structure of the module:
 #   - Private procedures and data
-#   - Public procedure
+#   - Public procedures
 #==============================================================================
 
 # Private procedures and data
 # ===========================
 
-interp alias {} ttk::wideSpinbox::CreateImg \
-	     {} image create photo -format $::tk::svgFmt
 interp alias {} ttk::wideSpinbox::CreateElem {} ttk::style element create
 
 namespace eval ttk::wideSpinbox {
@@ -28,10 +26,9 @@ namespace eval ttk::wideSpinbox {
 <svg width="20" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
  <circle cx="10" cy="8" r="8" fill="bg"/>
  <path d="m6 6 4 4 4-4" fill="none" stroke-linecap="round" stroke-linejoin="round" }
-    variable gapImg [CreateImg -data {
-<svg width="4" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg"/>}]
 
-    variable onAndroid [expr {[info exists ::tk::android] && $::tk::android}]
+    variable onAndroid	  [expr {[info exists ::tk::android] && $::tk::android}]
+    variable madeElements 0
 }
 
 #------------------------------------------------------------------------------
@@ -190,8 +187,37 @@ proc ttk::wideSpinbox::UpdateElements theme {
     $aImg configure -data $imgData
 }
 
-# Public procedure
-# ================
+# Public procedures
+# =================
+
+#------------------------------------------------------------------------------
+# ttk::wideSpinbox::CondMakeElements
+#
+# Creates the elements WideSpinbox.uparrow and WideSpinbox.downarrow of the
+# Wide.TSpinbox layout if necessary.  Invoked from within the C code, by the
+# ttk::spinbox widget initialization hook.
+#------------------------------------------------------------------------------
+proc ttk::wideSpinbox::CondMakeElements {} {
+    variable madeElements
+    if {!$madeElements} {
+	# If Tk's scaling factor was changed via "tk scaling"
+	# then $::tk::svgFmt now has the updated value.
+
+	interp alias {} ::ttk::wideSpinbox::CreateImg \
+		     {} image create photo -format $::tk::svgFmt
+	variable gapImg [CreateImg -data {
+<svg width="4" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg"/>}]
+
+	set theme [ttk::style theme use]
+	CreateElements $theme
+	UpdateElements $theme
+
+	variable elemInfoArr
+	set elemInfoArr($theme) 1
+
+	set madeElements 1
+    }
+} 
 
 #------------------------------------------------------------------------------
 # ttk::wideSpinbox::MakeOrUpdateElements
@@ -202,6 +228,11 @@ proc ttk::wideSpinbox::UpdateElements theme {
 # ttk::AppearanceChanged (see ttk.tcl).
 #------------------------------------------------------------------------------
 proc ttk::wideSpinbox::MakeOrUpdateElements {} {
+    variable madeElements
+    if {!$madeElements} {
+	return ""
+    }
+
     variable elemInfoArr
     set theme [ttk::style theme use]