From 8f1d8be7a7572db951eae48745055f823cf52b61 Mon Sep 17 00:00:00 2001 From: Andrew Mahone Date: Thu, 29 Jan 2009 03:30:41 +0000 Subject: pictureflow tweaks: allow wider covers on landscape, bringing square covers closer to suggested size from pre-scaling pictureflow tweak defaults for center margin and cover spacing a little bit change default title display to bottom if LCD_HEIGHT <= 100 git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19877 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/pictureflow.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'apps/plugins') diff --git a/apps/plugins/pictureflow.c b/apps/plugins/pictureflow.c index 2dbbb81d85..665ef9576f 100644 --- a/apps/plugins/pictureflow.c +++ b/apps/plugins/pictureflow.c @@ -106,8 +106,8 @@ typedef fb_data pix_t; #define REFLECT_TOP (LCD_HEIGHT * 2 / 3) #define REFLECT_HEIGHT (LCD_HEIGHT - REFLECT_TOP) #define DISPLAY_HEIGHT REFLECT_TOP -#define DISPLAY_WIDTH (LCD_HEIGHT * LCD_PIXEL_ASPECT_HEIGHT / \ - LCD_PIXEL_ASPECT_WIDTH / 2) +#define DISPLAY_WIDTH MAX((LCD_HEIGHT * LCD_PIXEL_ASPECT_HEIGHT / \ + LCD_PIXEL_ASPECT_WIDTH / 2), (LCD_WIDTH * 2 / 5)) #define REFLECT_SC ((0x10000U * 3 + (REFLECT_HEIGHT * 5 - 1)) / \ (REFLECT_HEIGHT * 5)) #define DISPLAY_OFFS ((LCD_HEIGHT / 2) - REFLECT_HEIGHT) @@ -205,14 +205,14 @@ static char* show_album_name_conf[] = #define MAX_MARGIN 80 /* config values and their defaults */ -static int slide_spacing = (LCD_WIDTH - DISPLAY_WIDTH) / 8; -static int center_margin = (LCD_WIDTH - DISPLAY_WIDTH) / 16; +static int slide_spacing = DISPLAY_WIDTH / 4; +static int center_margin = (LCD_WIDTH - DISPLAY_WIDTH) / 12; static int num_slides = 4; static int zoom = 100; static bool show_fps = false; static bool resize = true; static int cache_version = 0; -static int show_album_name = album_name_top; +static int show_album_name = (LCD_HEIGHT > 100) ? album_name_top : album_name_bottom; static struct configdata config[] = { -- cgit v1.2.3