summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2008-07-22 17:01:45 (GMT)
committerdas <das>2008-07-22 17:01:45 (GMT)
commit8daba6660a12dce054485bf87cef227741ac76a0 (patch)
tree570ccabf194a6f499d07a3b439cf65dd30315ee4
parentd3188c5ae3ead818ecd8dfdaa4f93bd100f1b8c8 (diff)
downloadtk-8daba6660a12dce054485bf87cef227741ac76a0.zip
tk-8daba6660a12dce054485bf87cef227741ac76a0.tar.gz
tk-8daba6660a12dce054485bf87cef227741ac76a0.tar.bz2
* library/ttk/aquaTheme.tcl: Use system color names and TIP145 named
font instead of hardcoded color values and deprecated native font name.
-rw-r--r--ChangeLog15
-rw-r--r--library/ttk/aquaTheme.tcl34
2 files changed, 28 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index 8361c09..ab9c4e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-22 Daniel Steffen <das@users.sourceforge.net>
+
+ * library/ttk/aquaTheme.tcl: Use system color names and TIP145 named
+ font instead of hardcoded color values and deprecated native font name.
+
+ * macosx/tkMacOSXHLEvents.c: factor out common code; formatting.
+
2008-07-08 Pat Thoyts <patthoyts@users.sourceforge.net>
* doc/*.n: Fixed broken line endings from last doc commit.
@@ -5,11 +12,9 @@
2008-07-04 Joe English <jenglish@users.sourceforge.net>
* generic/ttk/ttkDefaultTheme.c, generic/ttk/ttkClamTheme.c,
- generic/ttk/ttkClassicTheme.c, generic/ttk/ttkElements.c:
- Audit: ensure that output arguments to Tk_Get*FromObj()
- are initialized, in case of erroneous style specifications
- [Bug #2009213].
-
+ generic/ttk/ttkClassicTheme.c, generic/ttk/ttkElements.c: Audit:
+ ensure that output arguments to Tk_Get*FromObj() are initialized, in
+ case of erroneous style specifications. [Bug 2009213]
2008-07-02 Donal K. Fellows <dkf@users.sf.net>
diff --git a/library/ttk/aquaTheme.tcl b/library/ttk/aquaTheme.tcl
index ccb8bd3..85dcb04 100644
--- a/library/ttk/aquaTheme.tcl
+++ b/library/ttk/aquaTheme.tcl
@@ -1,5 +1,5 @@
#
-# $Id: aquaTheme.tcl,v 1.12 2008/05/23 20:20:06 jenglish Exp $
+# $Id: aquaTheme.tcl,v 1.13 2008/07/22 17:01:46 das Exp $
#
# Aqua theme (OSX native look and feel)
#
@@ -8,24 +8,25 @@ namespace eval ttk::theme::aqua {
ttk::style theme settings aqua {
ttk::style configure . \
- -font System \
- -background White \
- -foreground Black \
- -selectbackground SystemHighlight \
- -selectforeground SystemHighlightText \
+ -font TkDefaultFont \
+ -background systemWindowBody \
+ -foreground systemModelessDialogActiveText \
+ -selectbackground systemHighlight \
+ -selectforeground systemModelessDialogActiveText \
-selectborderwidth 0 \
- -insertwidth 1 \
- ;
+ -insertwidth 1
+
ttk::style map . \
- -foreground [list disabled "#7f7f7f" background "#7f7f7f"] \
- -selectbackground [list background "#c3c3c3" !focus "#c3c3c3"] \
- -selectforeground [list background "#a3a3a3" !focus "#000000"] \
- ;
+ -foreground {disabled systemModelessDialogInactiveText
+ background systemModelessDialogInactiveText} \
+ -selectbackground {background systemHighlightSecondary
+ !focus systemHighlightSecondary} \
+ -selectforeground {background systemModelessDialogInactiveText
+ !focus systemDialogActiveText}
# Workaround for #1100117:
# Actually, on Aqua we probably shouldn't stipple images in
# disabled buttons even if it did work...
- #
ttk::style configure . -stipple {}
ttk::style configure TButton -anchor center -width -6
@@ -40,8 +41,9 @@ namespace eval ttk::theme::aqua {
# Treeview:
ttk::style configure Heading -font TkHeadingFont
ttk::style configure Treeview -rowheight 18 -background White
- ttk::style map Treeview -background [list \
- {selected background} "#c3c3c3" selected SystemHighlight] ;
+ ttk::style map Treeview \
+ -background {{selected background} systemHighlightSecondary
+ selected systemHighlight}
# Enable animation for ttk::progressbar widget:
ttk::style configure TProgressbar -period 100 -maxphase 255
@@ -50,7 +52,7 @@ namespace eval ttk::theme::aqua {
# with a 14 pixel inset and 4 pixels spacing between border and label
# (ref: Apple Human Interface Guidelines / Controls / Grouping Controls)
#
- ttk::style configure TLabelframe \
+ ttk::style configure TLabelframe \
-labeloutside true -labelmargins {14 0 14 4}
# TODO: panedwindow sashes should be 9 pixels (HIG:Controls:Split Views)