Small improvements to sliding puzzle. (1) Don't draw the 'Moves' box at fixed size, and display 'Moves:' and number of moves on one line for square and portrait screens. (2) Use 4x4 spots on Archos too, to make the spots look square on the Archos display - change the default 80x64 image accordingly. (3) Replace the 110x110 images with 108x108 so that the width is evenly divisible by 4 (number of spots) as mentioned in the comment. (4) Make the greyscale images look a little less broken, could be even better though. -- The code could be made simpler and more flexible but one step at a time.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16200 a1c6a512-1295-4272-9138-f99709370657

7 files changed, 4 insertions, 4 deletions

diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES
index 2c667c10e8..2f6c7d344f 100644
--- a/apps/plugins/bitmaps/native/SOURCES
+++ b/apps/plugins/bitmaps/native/SOURCES
@@ -550,14 +550,14 @@ matrix_normal.bmp
 #if (LCD_WIDTH != LCD_HEIGHT)
 #define SMALLER_DIMENSION ((LCD_WIDTH < LCD_HEIGHT) ? LCD_WIDTH : LCD_HEIGHT)
 #else /* 5/6GB H10 with square display */
-#define SMALLER_DIMENSION (LCD_HEIGHT - 18)
+#define SMALLER_DIMENSION (LCD_HEIGHT - 20)
 #endif
 
 #if defined HAVE_LCD_COLOR
 #if SMALLER_DIMENSION <= 80
     sliding_puzzle.80x80x16.bmp
-#elif SMALLER_DIMENSION <= 112
-    sliding_puzzle.110x110x16.bmp
+#elif SMALLER_DIMENSION <= 108
+    sliding_puzzle.108x108x16.bmp
 #elif SMALLER_DIMENSION <= 128
     sliding_puzzle.128x128x16.bmp
 #elif SMALLER_DIMENSION <= 132
@@ -569,7 +569,7 @@ matrix_normal.bmp
 #endif
 #elif (LCD_DEPTH > 1)
 #if SMALLER_DIMENSION <= 110
-    sliding_puzzle.110x110x2.bmp
+    sliding_puzzle.108x108x2.bmp
 #elif SMALLER_DIMENSION <= 128
     sliding_puzzle.128x128x2.bmp
 #endif
diff --git a/apps/plugins/bitmaps/native/sliding_puzzle.108x108x16.bmp b/apps/plugins/bitmaps/native/sliding_puzzle.108x108x16.bmp
new file mode 100644
index 0000000000..50b997223b
--- /dev/null
+++ b/apps/plugins/bitmaps/native/sliding_puzzle.108x108x16.bmp
diff --git a/apps/plugins/bitmaps/native/sliding_puzzle.108x108x2.bmp b/apps/plugins/bitmaps/native/sliding_puzzle.108x108x2.bmp
new file mode 100644
index 0000000000..25e7e41df8
--- /dev/null
+++ b/apps/plugins/bitmaps/native/sliding_puzzle.108x108x2.bmp
diff --git a/apps/plugins/bitmaps/native/sliding_puzzle.110x110x16.bmp b/apps/plugins/bitmaps/native/sliding_puzzle.110x110x16.bmp
deleted file mode 100644
index 740b957d46..0000000000
--- a/apps/plugins/bitmaps/native/sliding_puzzle.110x110x16.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/native/sliding_puzzle.110x110x2.bmp b/apps/plugins/bitmaps/native/sliding_puzzle.110x110x2.bmp
deleted file mode 100644
index e21531ec70..0000000000
--- a/apps/plugins/bitmaps/native/sliding_puzzle.110x110x2.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/native/sliding_puzzle.128x128x2.bmp b/apps/plugins/bitmaps/native/sliding_puzzle.128x128x2.bmp
index e8ef4eead8..1a8317c4ba 100644
--- a/apps/plugins/bitmaps/native/sliding_puzzle.128x128x2.bmp
+++ b/apps/plugins/bitmaps/native/sliding_puzzle.128x128x2.bmp
diff --git a/apps/plugins/bitmaps/native/sliding_puzzle.80x64x1.bmp b/apps/plugins/bitmaps/native/sliding_puzzle.80x64x1.bmp
index a394e8eba3..6624bd7987 100644
--- a/apps/plugins/bitmaps/native/sliding_puzzle.80x64x1.bmp
+++ b/apps/plugins/bitmaps/native/sliding_puzzle.80x64x1.bmp