Merge branch 'dev' into work/v1.7

1 files changed, 9 insertions, 3 deletions

diff --git a/src/ui/paint.c b/src/ui/paint.c
index c575d5fc..79adb7d1 100644
--- a/src/ui/paint.c
+++ b/src/ui/paint.c
@@ -89,13 +89,19 @@ void drawRect_Paint(const iPaint *d, iRect rect, int color) {
     /* Keep the right/bottom edge visible in the window. */
     if (br.x == d->dst->size.x) br.x--;
     if (br.y == d->dst->size.y) br.y--;
-    const SDL_Point edges[] = {
+    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 },
         { left_Rect(rect),  br.y },
         { left_Rect(rect),  top_Rect(rect) }
     };
+#if SDL_VERSION_ATLEAST(2, 0, 16)
+    if (isOpenGLRenderer_Window()) {
+        /* A very curious regression in SDL 2.0.16. */
+        edges[3].y--;
+    }
+#endif
     setColor_Paint_(d, color);
     SDL_RenderDrawLines(renderer_Paint_(d), edges, iElemCount(edges));
 }