diff options
author | Joe Mistachkin <joe@mistachkin.com> | 2014-11-11 22:23:34 (GMT) |
---|---|---|
committer | Joe Mistachkin <joe@mistachkin.com> | 2014-11-11 22:23:34 (GMT) |
commit | b15c525eedc93a453dfea94482bc1198e27748fc (patch) | |
tree | 49a88f59bc168351fe802d8aa68da6d853b823aa /macosx/ttkMacOSXTheme.c | |
parent | 07f85cd3c1b4934fb746ea36516ba2944b4eea11 (diff) | |
parent | ee9722cf78769c35f57383613f570b6e797e74bf (diff) | |
download | tk-b15c525eedc93a453dfea94482bc1198e27748fc.zip tk-b15c525eedc93a453dfea94482bc1198e27748fc.tar.gz tk-b15c525eedc93a453dfea94482bc1198e27748fc.tar.bz2 |
Merge updates from core 8.5 branch.
Diffstat (limited to 'macosx/ttkMacOSXTheme.c')
-rw-r--r-- | macosx/ttkMacOSXTheme.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c index 5752fb1..64b96cb 100644 --- a/macosx/ttkMacOSXTheme.c +++ b/macosx/ttkMacOSXTheme.c @@ -294,14 +294,21 @@ static Ttk_StateTable TabPositionTable[] = { * TP30000359-TPXREF116> */ -static const int TAB_HEIGHT = 10; -static const int TAB_OVERLAP = 10; +int TAB_HEIGHT = 0; +int TAB_OVERLAP = 0; static void TabElementSize( void *clientData, void *elementRecord, Tk_Window tkwin, int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr) { - *heightPtr = TAB_HEIGHT + TAB_OVERLAP - 1; + TAB_HEIGHT = 10; + TAB_OVERLAP = 10; + /*Different metrics on 10.10/Yosemite.*/ + if (MAC_OS_X_VERSION_MIN_REQUIRED > 100000) { + TAB_OVERLAP = 5; + } + *heightPtr = TAB_HEIGHT + TAB_OVERLAP - 1; + } static void TabElementDraw( |