From 1932542ac46aca936ee57747f633f1af4d0881f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Gimenez?= <gimenez@pps.jussieu.fr>
Date: Wed, 19 Nov 2014 13:15:46 +0100
Subject: [PATCH 01/11] Adapts to smaller screens

The spiral level is now one leg smaller.
Also improves the readability of the start screen logo.
---
 data/conf           | 4 ++--
 data/levels/4a.laby | 4 +---
 src/gfx.ml          | 9 +++++----
 src/level.ml        | 4 ++--
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/data/conf b/data/conf
index cae4897..8155edc 100644
--- a/data/conf
+++ b/data/conf
@@ -1,6 +1,6 @@
 #int	gfx.tile-size                  :40
-#int	gfx.window.width               :1000
-#int	gfx.window.height              :750
+#int	gfx.window.width               :640
+#int	gfx.window.height              :480
 #string	gfx.source-style               :classic
 #string	mod.selected                   :ocaml
 #bool	mod.exclusive                  :false
diff --git a/data/levels/4a.laby b/data/levels/4a.laby
index ad9565e..76ab568 100644
--- a/data/levels/4a.laby
+++ b/data/levels/4a.laby
@@ -10,9 +10,7 @@ o . o . o . x o . o . o . o
 o . o . o o o o . o . o . o
 o . o . . . . . . o . o . o
 o . o o o o o o o o . o . o
-o . . . . . . . . . . o . o
-o o o o o o o o o o o o . o
-o → . . . . . . . . . . . o
+o . . . . . . . . . . o ↑ o
 o o o o o o o o o o o o o o
 
 title:
diff --git a/src/gfx.ml b/src/gfx.ml
index 64f8d62..7c0e45f 100644
--- a/src/gfx.ml
+++ b/src/gfx.ml
@@ -32,11 +32,11 @@ let conf_window =
     (F.x "initial window geometry" [])
 
 let conf_window_width =
-  Conf.int ~p:(conf_window#plug "width") ~d:1000
+  Conf.int ~p:(conf_window#plug "width") ~d:800
     (F.x "width of window" [])
 
 let conf_window_height =
-  Conf.int ~p:(conf_window#plug "height") ~d:750
+  Conf.int ~p:(conf_window#plug "height") ~d:600
     (F.x "height of window" [])
 
 exception Error of F.t
@@ -248,10 +248,11 @@ let layout () =
 
   (* Game screen *)
   let hpaned = GPack.paned `HORIZONTAL ~packing:main_vbox#add () in
-  hpaned#set_position 620;
+  let tile_size = max 5 conf_tilesize#get in
+  hpaned#set_position (70 + 550 * tile_size / 40);
   let lvbox = GPack.vbox ~packing:hpaned#add1 () in
   let vpaned = GPack.paned `VERTICAL ~packing:hpaned#add () in
-  vpaned#set_position 450;
+  vpaned#set_position 350;
   let view_title = label lvbox#pack in
   let view_comment = label lvbox#pack in
   let sw_laby = scrolled ~vpolicy:`AUTOMATIC lvbox#add in
diff --git a/src/level.ml b/src/level.ml
index 392a1d7..ba59e6e 100644
--- a/src/level.ml
+++ b/src/level.ml
@@ -24,11 +24,11 @@ let dummy =
       [|
 	[| `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall |];
 	[| `Wall; `Void; `Wall; `Void; `Void; `Void; `Void; `Void; `Void; `Void; `Void; `Wall; `Void; `Void; `Void; `Void; `Void; `Void; `Void; `Void; `Void; `Wall |];
-	[| `Wall; `Void; `Wall; `Void; `Void; `Void; `Wall; `Wall; `Wall; `Void; `Void; `Wall; `Void; `Void; `Void; `Void; `Wall; `Void; `Void; `Wall; `Void; `Wall |];
+	[| `Wall; `Void; `Wall; `Void; `Void; `Void; `Void; `Wall; `Wall; `Void; `Void; `Wall; `Void; `Void; `Void; `Void; `Wall; `Void; `Void; `Wall; `Void; `Wall |];
 	[| `Wall; `Void; `Wall; `Void; `Void; `Void; `Void; `Void; `Web ; `Wall; `Void; `Wall; `Wall; `Wall; `Void; `Void; `Wall; `Void; `Void; `Wall; `Void; `Wall |];
 	[| `Wall; `Void; `Wall; `Void; `Void; `Void; `Wall; `Wall; `Wall; `Wall; `Void; `Wall; `Void; `Void; `Wall; `Void; `Wall; `Void; `Void; `Wall; `Void; `Wall |];
 	[| `Wall; `Void; `Wall; `Void; `Void; `Void; `Wall; `Void; `Void; `Wall; `Void; `Wall; `Void; `Void; `Wall; `Void; `Void; `Wall; `Web ; `Wall; `Void; `Wall |];
-	[| `Wall; `Void; `Wall; `Wall; `Wall; `Void; `Void; `Wall; `Wall; `Void; `Void; `Wall; `Wall; `Wall; `Void; `Void; `Void; `Void; `Wall; `Void; `Void; `Wall |];
+	[| `Wall; `Void; `Wall; `Wall; `Wall; `Void; `Void; `Wall; `Wall; `Wall; `Void; `Wall; `Wall; `Wall; `Void; `Void; `Void; `Void; `Wall; `Void; `Void; `Wall |];
 	[| `Wall; `Void; `Void; `Void; `Void; `Void; `Void; `Void; `Void; `Void; `Void; `Void; `Void; `Void; `Void; `Void; `Void; `Wall; `Void; `Void; `Void; `Wall |];
 	[| `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall; `Wall |];
       |];
-- 
2.9.4