From 48b0ef1cf22ec37927116ac83ea7c7cfc1f9083e Mon Sep 17 00:00:00 2001
From: Franklin Wei <franklin@rockbox.org>
Date: Thu, 25 Jun 2020 14:44:33 -0400
Subject: puzzles: resync with upstream

This brings the upstream version to 9aa7b7c (with some of my changes as
well).

Change-Id: I5bf8a3e0b8672d82cb1bf34afc07adbe12a3ac53
---
 apps/plugins/puzzles/src/grid.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'apps/plugins/puzzles/src/grid.c')

diff --git a/apps/plugins/puzzles/src/grid.c b/apps/plugins/puzzles/src/grid.c
index 89bde187be..5ea37439d4 100644
--- a/apps/plugins/puzzles/src/grid.c
+++ b/apps/plugins/puzzles/src/grid.c
@@ -2378,6 +2378,8 @@ static void grid_size_floret(int width, int height,
     *tilesize = FLORET_TILESIZE;
     *xextent = (6*px+3*qx)/2 * (width-1) + 4*qx + 2*px;
     *yextent = (5*qy-4*py) * (height-1) + 4*qy + 2*ry;
+    if (height == 1)
+        *yextent += (5*qy-4*py)/2;
 }
 
 static grid *grid_new_floret(int width, int height, const char *desc)
-- 
cgit v1.2.3