Tk Source Code

Artifact 2d27c4da42540e8fcf3bd978a33b1742272859244ab9f0592122ad06870d4745:

Index: generic/ttk/ttkClamTheme.c
==================================================================
--- generic/ttk/ttkClamTheme.c
+++ generic/ttk/ttkClamTheme.c
@@ -928,10 +928,11 @@
     Ttk_Padding padding = Ttk_UniformPadding((short)round(3 * scalingLevel));
     int size = 10;
 
     Tk_GetPixelsFromObj(NULL, tkwin, sb->arrowSizeObj, &size);
     size -= Ttk_PaddingWidth(padding);
+    size += 2 * round(scalingLevel);
     TtkArrowSize(size/2, direction, widthPtr, heightPtr);
     *widthPtr += Ttk_PaddingWidth(padding);
     *heightPtr += Ttk_PaddingHeight(padding);
 }
 

Index: generic/ttk/ttkDefaultTheme.c
==================================================================
--- generic/ttk/ttkDefaultTheme.c
+++ generic/ttk/ttkDefaultTheme.c
@@ -867,10 +867,11 @@
     padding.right = round(ArrowPadding.right * scalingLevel);
     padding.bottom = round(ArrowPadding.bottom * scalingLevel);
 
     Tk_GetPixelsFromObj(NULL, tkwin, arrow->sizeObj, &size);
     size -= Ttk_PaddingWidth(padding);
+    size += round(scalingLevel);
     TtkArrowSize(size/2, direction, widthPtr, heightPtr);
     *widthPtr += Ttk_PaddingWidth(padding);
     *heightPtr += Ttk_PaddingHeight(padding);
 }
 

Index: generic/ttk/ttkElements.c
==================================================================
--- generic/ttk/ttkElements.c
+++ generic/ttk/ttkElements.c
@@ -1113,10 +1113,11 @@
     padding.right = round(ArrowPadding.right * scalingLevel);
     padding.bottom = round(ArrowPadding.bottom * scalingLevel);
 
     Tk_GetPixelsFromObj(NULL, tkwin, arrow->sizeObj, &size);
     size -= Ttk_PaddingWidth(padding);
+    size += 2 * round(scalingLevel);
     TtkArrowSize(size/2, direction, widthPtr, heightPtr);
     *widthPtr += Ttk_PaddingWidth(padding);
     *heightPtr += Ttk_PaddingHeight(padding);
 }
 

Index: library/demos/ttkspin.tcl
==================================================================
--- library/demos/ttkspin.tcl
+++ library/demos/ttkspin.tcl
@@ -13,11 +13,11 @@
 toplevel $w
 wm title $w "Themed Spinbox Demonstration"
 wm iconname $w "ttkspin"
 positionWindow $w
 
-label $w.msg -font $font -wraplength 5i -justify left -text "Three different\
+ttk::label $w.msg -font $font -wraplength 5i -justify left -text "Three different\
 	themed spin-boxes are displayed below.  You can add characters by\
 	pointing, clicking and typing.  The normal Motif editing characters\
 	are supported, along with many Emacs bindings.  For example, Backspace\
 	and Control-h delete the character to the left of the insertion\
 	cursor and Delete and Control-d delete the chararacter to the right\
@@ -29,10 +29,14 @@
 pack $w.msg -side top
 
 ## See Code / Dismiss buttons
 set btns [addSeeDismiss $w.buttons $w]
 pack $btns -side bottom -fill x
+
+ttk::frame $w.f
+pack $w.f -fill both -expand 1
+set w $w.f
 
 set australianCities {
     Canberra Sydney Melbourne Perth Adelaide Brisbane
     Hobart Darwin "Alice Springs"
 }