Merge branch 'dev' into work/v1.7

1 files changed, 13 insertions, 2 deletions

diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index a9a2d033..edc36a49 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,9 +297,18 @@ 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),
+                bottomRight_Rect(frameRect),
+                bottomLeft_Rect(frameRect)
             };
+#if SDL_VERSION_ATLEAST(2, 0, 16)
+            if (isOpenGLRenderer_Window()) {
+                /* A very curious regression in SDL 2.0.16. */
+                points[3].x--;    
+            }
+#endif
             drawLines_Paint(&p, points + 2, 3, frame2);
             drawLines_Paint(
                 &p, points, !isHover && flags & d->flags.noTopFrame ? 2 : 3, frame);