From 5d1c639c749bd73d90e37f7f67de9646ca84bd6d Mon Sep 17 00:00:00 2001
From: Kevin Walzer <kw@codebykevin.com>
Date: Sun, 15 Feb 2015 18:29:14 +0000
Subject: Better alingment of notebook tabs in Cocoa; thanks to Marc Culler for
 patch

---
 macosx/ttkMacOSXTheme.c | 16 ++++------------
 1 file 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
-- 
cgit v0.12


From 2d63ea99a19f290fc631561cb060fd7dd7a719d8 Mon Sep 17 00:00:00 2001
From: Kevin Walzer <kw@codebykevin.com>
Date: Sun, 15 Feb 2015 18:54:12 +0000
Subject: Remove Mac-specific display timer from tkTextDisp.c; no longer needed

---
 generic/tkTextDisp.c | 42 ------------------------------------------
 1 file changed, 42 deletions(-)

diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 3edd5dc..bcbb03a 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -3931,30 +3931,6 @@ TkTextUpdateOneLine(
  *
  *----------------------------------------------------------------------
  */
-#ifdef MAC_OSX_TK
-static void
-RedisplayText(
-    ClientData clientData )
-{
-    register TkText *textPtr = (TkText *) clientData;
-    TextDInfo *dInfoPtr = textPtr->dInfoPtr;
-    TkRegion damageRegion;
-    XRectangle rectangle;
-
-    if (dInfoPtr == NULL) {
-	return;
-    }
-    damageRegion = TkCreateRegion();
-    rectangle.x = 0;
-    rectangle.y = 0;
-    rectangle.width = dInfoPtr->maxX;
-    rectangle.height = dInfoPtr->maxY;
-    TkUnionRectWithRegion(&rectangle, damageRegion, damageRegion);
-    
-    TextInvalidateRegion(textPtr, damageRegion);
-    DisplayText(clientData);
-}
-#endif
 
 static void
 DisplayText(
@@ -3969,9 +3945,6 @@ DisplayText(
     int bottomY = 0;		/* Initialization needed only to stop compiler
 				 * warnings. */
     Tcl_Interp *interp;
-#ifdef MAC_OSX_TK
-    Tcl_TimerToken macRefreshTimer = NULL;
-#endif
 
     if ((textPtr->tkwin == NULL) || (textPtr->flags & DESTROYED)) {
 	/*
@@ -4165,21 +4138,6 @@ DisplayText(
 		damageRgn)) {
 	    TextInvalidateRegion(textPtr, damageRgn);
 
-#ifdef MAC_OSX_TK
-
-	    /*
-	     * On OS X large scrolls sometimes leave garbage on the screen.
-	     * This attempts to clean it up by redisplaying the Text window
-	     * after 200 milliseconds.
-	     */
-	    if ( abs(y-oldY) > 14 ) {
-		Tcl_DeleteTimerHandler(macRefreshTimer);
-		macRefreshTimer = Tcl_CreateTimerHandler(200,
-							 RedisplayText,
-							 clientData);
-	    }
-#endif
-
 	}
 	numCopies++;
 	TkDestroyRegion(damageRgn);
-- 
cgit v0.12