Getting a few pixels more filename display width by using a smaller cursor icon

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

3 files changed, 7 insertions, 5 deletions

diff --git a/apps/recorder/icons.c b/apps/recorder/icons.c
index a6df8c9c23..e094a12400 100644
--- a/apps/recorder/icons.c
+++ b/apps/recorder/icons.c
@@ -63,7 +63,7 @@ unsigned char bitmap_icons_6x8[LastIcon][6] =
     /* Selected */
     { 0x00, 0x1c, 0x3e, 0x3e, 0x3e, 0x1c },
     /* Cursor / Marker */
-    { 0x7f, 0x3e, 0x1c, 0x08, 0x00, 0x00 },
+    { 0x3e, 0x1c, 0x08, 0x00, 0x00, 0x00 },
 };
 
 static unsigned char bitmap_icon_7x8[][7] =
diff --git a/apps/tree.c b/apps/tree.c
index 8d16806304..8b98f2b940 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -73,9 +73,9 @@ void browse_root(void)
 #define TREE_MAX_LEN_DISPLAY 16 /* max length that fits on screen */
  
 #define MARGIN_Y      0  /* Y pixel margin */
-#define MARGIN_X      12 /* X pixel margin */
+#define MARGIN_X      10 /* X pixel margin */
 #define LINE_Y      (global_settings.statusbar&&statusbar_enabled?1:0) /* Y position the entry-list starts at */
-#define LINE_X      2 /* X position the entry-list starts at */
+#define LINE_X      0 /* X position the entry-list starts at */
 #define LINE_HEIGTH 8 /* pixels for each text line */
 
 #define CURSOR_Y    0 /* the cursor is not positioned in regard to
@@ -241,7 +241,7 @@ static int showdir(char *path, int start)
 #endif
     lcd_clear_display();
 #ifdef HAVE_LCD_BITMAP
-    lcd_setmargins(0,MARGIN_Y);
+    lcd_setmargins(MARGIN_X,MARGIN_Y); /* leave room for cursor and icon */
     lcd_setfont(0);
 #endif
 
@@ -263,7 +263,7 @@ static int showdir(char *path, int start)
                 icon_type = File;
         }
         lcd_bitmap(bitmap_icons_6x8[icon_type], 
-                   6, MARGIN_Y+(LINE_Y+i-start)*line_height, 6, 8, true);
+                   4, MARGIN_Y+(LINE_Y+i-start)*line_height, 6, 8, true);
 #endif
 
 
diff --git a/apps/wps.c b/apps/wps.c
index 25ec9a7125..acb6d90a13 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -361,6 +361,8 @@ int wps_show(void)
 #ifdef HAVE_LCD_CHARCELLS
     lcd_icon(ICON_AUDIO, true);
     lcd_icon(ICON_PARAM, false);
+#else
+    lcd_setmargins(0,0);
 #endif
 
     if(mpeg_is_playing())