summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2012-06-14 22:50:22 +0200
committerFrank Gevaerts <frank@gevaerts.be>2012-06-19 21:27:53 +0200
commit3d0c787a48ff0d26fa5a1e93a4ca237df8999acf (patch)
tree5679a92bbad8c208e492ba0229541fc8010460ce
parentbc657b51636dd7d5aa0d0a0d904e3f8799a560d6 (diff)
downloadrockbox-3d0c787a48ff0d26fa5a1e93a4ca237df8999acf.tar.gz
rockbox-3d0c787a48ff0d26fa5a1e93a4ca237df8999acf.zip
Change display_zoom from int to double.
The main reason for this is to be able to downscale the sdl app, which when used for designing themes for android tends not to fit on laptop screens these days. Change-Id: Ib52731dbebcdd03a572be7754c157471165eb2df
-rw-r--r--firmware/target/hosted/sdl/lcd-sdl.c2
-rw-r--r--firmware/target/hosted/sdl/system-sdl.c4
-rw-r--r--firmware/target/hosted/sdl/system-sdl.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/firmware/target/hosted/sdl/lcd-sdl.c b/firmware/target/hosted/sdl/lcd-sdl.c
index 57026eedfe..40ba94072b 100644
--- a/firmware/target/hosted/sdl/lcd-sdl.c
+++ b/firmware/target/hosted/sdl/lcd-sdl.c
@@ -24,7 +24,7 @@
24#include "sim-ui-defines.h" 24#include "sim-ui-defines.h"
25#include "system.h" /* for MIN() and MAX() */ 25#include "system.h" /* for MIN() and MAX() */
26 26
27int display_zoom = 1; 27double display_zoom = 1;
28 28
29void sdl_update_rect(SDL_Surface *surface, int x_start, int y_start, int width, 29void sdl_update_rect(SDL_Surface *surface, int x_start, int y_start, int width,
30 int height, int max_x, int max_y, 30 int height, int max_x, int max_y,
diff --git a/firmware/target/hosted/sdl/system-sdl.c b/firmware/target/hosted/sdl/system-sdl.c
index 1e1968d66d..b03ed89d49 100644
--- a/firmware/target/hosted/sdl/system-sdl.c
+++ b/firmware/target/hosted/sdl/system-sdl.c
@@ -314,7 +314,7 @@ void sys_handle_argv(int argc, char *argv[])
314 { 314 {
315 x++; 315 x++;
316 if(x < argc) 316 if(x < argc)
317 display_zoom=atoi(argv[x]); 317 display_zoom=atof(argv[x]);
318 else 318 else
319 display_zoom = 2; 319 display_zoom = 2;
320 printf("Window zoom is %d\n", display_zoom); 320 printf("Window zoom is %d\n", display_zoom);
@@ -364,7 +364,7 @@ void sys_handle_argv(int argc, char *argv[])
364 } 364 }
365 } 365 }
366 } 366 }
367 if (display_zoom > 1) { 367 if (display_zoom != 1) {
368 background = false; 368 background = false;
369 } 369 }
370} 370}
diff --git a/firmware/target/hosted/sdl/system-sdl.h b/firmware/target/hosted/sdl/system-sdl.h
index 979d556fdd..43ee0bdff1 100644
--- a/firmware/target/hosted/sdl/system-sdl.h
+++ b/firmware/target/hosted/sdl/system-sdl.h
@@ -59,7 +59,7 @@ void sim_do_exit(void) NORETURN_ATTR;
59 59
60extern bool background; /* True if the background image is enabled */ 60extern bool background; /* True if the background image is enabled */
61extern bool showremote; 61extern bool showremote;
62extern int display_zoom; 62extern double display_zoom;
63extern long start_tick; 63extern long start_tick;
64 64
65#endif /* _SYSTEM_SDL_H_ */ 65#endif /* _SYSTEM_SDL_H_ */