Tk Source Code

1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84

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" }