diff options
| author | fvogel <fvogelnew1@free.fr> | 2017-03-06 18:24:38 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2017-03-06 18:24:38 (GMT) |
| commit | e98430e7e070536bd9d5ccb44afa4976b735ff65 (patch) | |
| tree | 15779675471fdc625c17330f72e4c676f065d928 /library/ttk/defaults.tcl | |
| parent | ee16a52044d53a25664ecc7f02b042e3fb638baf (diff) | |
| parent | 05fb5c3c424e8c68a0cf14a68d2f32570b2d5d69 (diff) | |
| download | tk-e98430e7e070536bd9d5ccb44afa4976b735ff65.zip tk-e98430e7e070536bd9d5ccb44afa4976b735ff65.tar.gz tk-e98430e7e070536bd9d5ccb44afa4976b735ff65.tar.bz2 | |
merge trunk
Diffstat (limited to 'library/ttk/defaults.tcl')
| -rw-r--r-- | library/ttk/defaults.tcl | 42 |
1 files changed, 29 insertions, 13 deletions
diff --git a/library/ttk/defaults.tcl b/library/ttk/defaults.tcl index 4551966..9cc5880 100644 --- a/library/ttk/defaults.tcl +++ b/library/ttk/defaults.tcl @@ -5,16 +5,19 @@ namespace eval ttk::theme::default { variable colors array set colors { - -frame "#d9d9d9" - -foreground "#000000" - -window "#ffffff" - -text "#000000" - -activebg "#ececec" - -selectbg "#4a6984" - -selectfg "#ffffff" - -darker "#c3c3c3" - -disabledfg "#a3a3a3" - -indicator "#4a6984" + -frame "#d9d9d9" + -foreground "#000000" + -window "#ffffff" + -text "#000000" + -activebg "#ececec" + -selectbg "#4a6984" + -selectfg "#ffffff" + -darker "#c3c3c3" + -disabledfg "#a3a3a3" + -indicator "#4a6984" + -disabledindicator "#a3a3a3" + -altindicator "#9fbdd8" + -disabledaltindicator "#c0c0c0" } ttk::style theme settings default { @@ -45,12 +48,24 @@ namespace eval ttk::theme::default { ttk::style configure TCheckbutton \ -indicatorcolor "#ffffff" -indicatorrelief sunken -padding 1 ttk::style map TCheckbutton -indicatorcolor \ - [list pressed $colors(-activebg) selected $colors(-indicator)] + [list pressed $colors(-activebg) \ + {!disabled alternate} $colors(-altindicator) \ + {disabled alternate} $colors(-disabledaltindicator) \ + {!disabled selected} $colors(-indicator) \ + {disabled selected} $colors(-disabledindicator)] + ttk::style map TCheckbutton -indicatorrelief \ + [list alternate raised] ttk::style configure TRadiobutton \ -indicatorcolor "#ffffff" -indicatorrelief sunken -padding 1 ttk::style map TRadiobutton -indicatorcolor \ - [list pressed $colors(-activebg) selected $colors(-indicator)] + [list pressed $colors(-activebg) \ + {!disabled alternate} $colors(-altindicator) \ + {disabled alternate} $colors(-disabledaltindicator) \ + {!disabled selected} $colors(-indicator) \ + {disabled selected} $colors(-disabledindicator)] + ttk::style map TRadiobutton -indicatorrelief \ + [list alternate raised] ttk::style configure TMenubutton \ -relief raised -padding "10 3" @@ -62,7 +77,8 @@ namespace eval ttk::theme::default { ttk::style configure TCombobox -arrowsize 12 -padding 1 ttk::style map TCombobox -fieldbackground \ - [list readonly $colors(-frame) disabled $colors(-frame)] + [list readonly $colors(-frame) disabled $colors(-frame)] \ + -arrowcolor [list disabled $colors(-disabledfg)] ttk::style configure TSpinbox -arrowsize 10 -padding {2 0 10 0} ttk::style map TSpinbox -fieldbackground \ |