2 files changed, 18 insertions, 4 deletions

diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index a9a2d033..d6cc31cb 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -30,6 +30,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "keys.h"
 #include "touch.h"
 
+#include <SDL_version.h>
+
 struct Impl_LabelWidget {
     iWidget widget;
     iString srcLabel;
@@ -295,8 +297,16 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
         iRect frameRect = adjusted_Rect(rect, zero_I2(), init1_I2(-1));
         if (isButton) {
             iInt2 points[] = {
-                bottomLeft_Rect(frameRect), topLeft_Rect(frameRect), topRight_Rect(frameRect),
-                bottomRight_Rect(frameRect), bottomLeft_Rect(frameRect)
+                bottomLeft_Rect(frameRect),
+                topLeft_Rect(frameRect),
+                topRight_Rect(frameRect),
+#if SDL_VERSION_ATLEAST(2, 0, 16) && defined (iPlatformApple)
+                /* A very curious regression in SDL 2.0.16 on macOS. */
+                addX_I2(bottomRight_Rect(frameRect), -1),
+#else
+                bottomRight_Rect(frameRect),
+#endif
+                bottomLeft_Rect(frameRect)
             };
             drawLines_Paint(&p, points + 2, 3, frame2);
             drawLines_Paint(
diff --git a/src/ui/paint.c b/src/ui/paint.c
index c575d5fc..869238d5 100644
--- a/src/ui/paint.c
+++ b/src/ui/paint.c
@@ -91,9 +91,13 @@ void drawRect_Paint(const iPaint *d, iRect rect, int color) {
     if (br.y == d->dst->size.y) br.y--;
     const SDL_Point edges[] = {
         { left_Rect(rect),  top_Rect(rect) },
-        { br.x, top_Rect(rect) },
-        { br.x, br.y },
+        { br.x,             top_Rect(rect) },
+        { br.x,             br.y },
+#if SDL_VERSION_ATLEAST(2, 0, 16) && defined (iPlatformApple)
+        { left_Rect(rect),  br.y - 1 }, /* regression in SDL 2.0.16? */
+#else
         { left_Rect(rect),  br.y },
+#endif
         { left_Rect(rect),  top_Rect(rect) }
     };
     setColor_Paint_(d, color);