diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2015-02-15 18:29:14 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2015-02-15 18:29:14 (GMT) |
| commit | 5d1c639c749bd73d90e37f7f67de9646ca84bd6d (patch) | |
| tree | f025720e6096c29fa2e63a1c9ee6cdf9ef4811fd | |
| parent | 27538409d500aa8a26dd5f72bf26514ea234a95a (diff) | |
| download | tk-5d1c639c749bd73d90e37f7f67de9646ca84bd6d.zip tk-5d1c639c749bd73d90e37f7f67de9646ca84bd6d.tar.gz tk-5d1c639c749bd73d90e37f7f67de9646ca84bd6d.tar.bz2 | |
Better alingment of notebook tabs in Cocoa; thanks to Marc Culler for patch
| -rw-r--r-- | macosx/ttkMacOSXTheme.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c index 64b96cb..747254c 100644 --- a/macosx/ttkMacOSXTheme.c +++ b/macosx/ttkMacOSXTheme.c @@ -294,20 +294,13 @@ static Ttk_StateTable TabPositionTable[] = { * TP30000359-TPXREF116> */ -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) { - 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; + *heightPtr = kThemeMetricLargeTabHeight; + *paddingPtr = Ttk_MakePadding(0, 0, 0, 2); } @@ -326,7 +319,6 @@ static void TabElementDraw( .position = Ttk_StateTableLookup(TabPositionTable, state), }; - bounds.size.height += TAB_OVERLAP; BEGIN_DRAWING(d) ChkErr(HIThemeDrawTab, &bounds, &info, dc.context, HIOrientation, NULL); END_DRAWING @@ -364,8 +356,8 @@ static void PaneElementDraw( .adornment = kHIThemeTabPaneAdornmentNormal, }; - bounds.origin.y -= TAB_OVERLAP; - bounds.size.height += TAB_OVERLAP; + bounds.origin.y -= kThemeMetricTabFrameOverlap; + bounds.size.height += kThemeMetricTabFrameOverlap; BEGIN_DRAWING(d) ChkErr(HIThemeDrawTabPane, &bounds, &info, dc.context, HIOrientation); END_DRAWING |