From 77587d48dfa24f29cf65de67ac0abc7f8baa86cd Mon Sep 17 00:00:00 2001
From: Kevin Walzer <kw@codebykevin.com>
Date: Fri, 9 Aug 2019 12:19:28 +0000
Subject: Tweak display of spinboxes on macOS; thanks to Christopher Chavez for
 patch

---
 generic/tkEntry.c      | 24 ++++++++++--------------
 macosx/tkMacOSXEntry.c | 23 ++++++++++++-----------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/generic/tkEntry.c b/generic/tkEntry.c
index a7bc5a0..0dfacd7 100644
--- a/generic/tkEntry.c
+++ b/generic/tkEntry.c
@@ -1513,17 +1513,15 @@ EntryWorldChanged(
  *
  * TkpDrawEntryBorderAndFocus --
  *
- *	This function redraws the border of an entry widget. It overrides the
- *	generic border drawing code if the entry widget parameters are such
- *	that the native widget drawing is a good fit. This version just
- *	returns 0, so platforms that don't do special native drawing don't
- *	have to implement it.
+ *	Stub function for Tk on platforms other than Aqua
+ *	(Windows and X11), which do not draw native entry borders.
+ *	See macosx/tkMacOSXEntry.c for function definition in Tk Aqua.
  *
  * Results:
- *	1 if it has drawn the border, 0 if not.
+ *	Returns 0.
  *
  * Side effects:
- *	May draw the entry border into pixmap.
+ *	None.
  *
  *--------------------------------------------------------------
  */
@@ -1542,17 +1540,15 @@ TkpDrawEntryBorderAndFocus(
  *
  * TkpDrawSpinboxButtons --
  *
- *	This function redraws the buttons of an spinbox widget. It overrides
- *	the generic button drawing code if the spinbox widget parameters are
- *	such that the native widget drawing is a good fit. This version just
- *	returns 0, so platforms that don't do special native drawing don't
- *	have to implement it.
+ *	Stub function for Tk on platforms other than Aqua
+ *	(Windows and X11), which do not draw native spinbox buttons.
+ *	See macosx/tkMacOSXEntry.c for function definition in Tk Aqua.
  *
  * Results:
- *	1 if it has drawn the border, 0 if not.
+ *	Returns 0.
  *
  * Side effects:
- *	May draw the entry border into pixmap.
+ *	None.
  *
  *--------------------------------------------------------------
  */
diff --git a/macosx/tkMacOSXEntry.c b/macosx/tkMacOSXEntry.c
index a1c5d60..7915f6f 100644
--- a/macosx/tkMacOSXEntry.c
+++ b/macosx/tkMacOSXEntry.c
@@ -124,16 +124,17 @@ TkpDrawEntryBorderAndFocus(
 	int incDecWidth;
 
 	/*
-	 * Temporarily change the width of the widget so that the same code can
-	 * be used for drawing the Entry portion of the Spinbox as is used to
-	 * draw an ordinary Entry.  The width must be restored before
-	 * returning.
+	 * If native spinbox buttons are going to be drawn, then temporarily
+	 * change the width of the widget so that the same code can be used
+	 * for drawing the Entry portion of the Spinbox as is used to draw
+	 * an ordinary Entry.  The width must be restored before returning.
 	 */
 
 	oldWidth = Tk_Width(tkwin);
-	ComputeIncDecParameters(Tk_Height(tkwin) - 2 * MAC_OSX_FOCUS_WIDTH,
-		&incDecWidth);
-	Tk_Width(tkwin) -= incDecWidth + 1;
+	if (ComputeIncDecParameters(Tk_Height(tkwin) - 2 * MAC_OSX_FOCUS_WIDTH,
+		&incDecWidth) != 0) {
+	    Tk_Width(tkwin) -= incDecWidth + 1;
+	}
     }
 
    /*
@@ -186,10 +187,10 @@ TkpDrawEntryBorderAndFocus(
  *	have to implement it.
  *
  * Results:
- *	1 if it has drawn the border, 0 if not.
+ *	1 if it has drawn the buttons, 0 if not.
  *
  * Side effects:
- *	May draw the entry border into pixmap.
+ *	May draw the buttons into pixmap.
  *
  *--------------------------------------------------------------
  */
@@ -258,9 +259,9 @@ TkpDrawSpinboxButtons(
      */
 
     bgGC = Tk_GCForColor(sbPtr->entry.highlightBgColorPtr, d);
-    rects[0].x = bounds.origin.x;
+    rects[0].x = Tk_Width(tkwin) - incDecWidth - 1;
     rects[0].y = 0;
-    rects[0].width = Tk_Width(tkwin);
+    rects[0].width = incDecWidth + 1;
     rects[0].height = Tk_Height(tkwin);
     XFillRectangles(Tk_Display(tkwin), d, bgGC, rects, 1);
 
-- 
cgit v0.12