From bdbdb97f19655a635a2d37f81f9fe1e31f9162b2 Mon Sep 17 00:00:00 2001
From: Jonathan Gordon <rockbox@jdgordon.info>
Date: Mon, 23 Jun 2008 13:20:35 +0000
Subject: FS#9051 - remove LCD margins... use viewports if you need them...

NOTE to WPS people....
%m has been removed, but (i think) because of the other %m tags it wont fail if you try loading a wps with %m|..|, it will just be ignored.
Also note that if the statusbar is enabled the default viewport is 8 pixels shorter than when its not, i.e (0,0) is really (0,8) if the statusbar is shown... I dont think this will be a major issue because almost no WPS show the bar and use bitmaps... text only WPS shouldnt be affected.

Please report problem screens in http://forums.rockbox.org/index.php?topic=17358.0


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17763 a1c6a512-1295-4272-9138-f99709370657
---
 apps/plugins/solitaire.c      |  2 --
 apps/plugins/test_codec.c     |  1 -
 apps/plugins/test_disk.c      |  1 -
 apps/plugins/test_fps.c       |  2 --
 apps/plugins/test_viewports.c | 18 ------------------
 apps/plugins/viewer.c         |  4 ----
 6 files changed, 28 deletions(-)

(limited to 'apps/plugins')

diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index 94ef282698..e4e2a9ce45 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -744,7 +744,6 @@ int solitaire_menu(bool in_game)
                 break;
 
             case 2:
-                rb->lcd_setmargins(0, 0);
                 if (solitaire_help() == HELP_USB)
                     result = MENU_USB;
                 break;
@@ -766,7 +765,6 @@ int solitaire_menu(bool in_game)
         }
     }
     menu_exit(m);
-    rb->lcd_setmargins(0, 0);
     return result;
 }
 
diff --git a/apps/plugins/test_codec.c b/apps/plugins/test_codec.c
index 2379ebb1b7..31e8a319f9 100644
--- a/apps/plugins/test_codec.c
+++ b/apps/plugins/test_codec.c
@@ -44,7 +44,6 @@ static bool log_init(bool use_logfile)
 {
     int h;
 
-    rb->lcd_setmargins(0, 0);
     rb->lcd_getstringsize("A", NULL, &h);
     max_line = LCD_HEIGHT / h;
     line = 0;
diff --git a/apps/plugins/test_disk.c b/apps/plugins/test_disk.c
index 93464807c3..06017a3c5c 100644
--- a/apps/plugins/test_disk.c
+++ b/apps/plugins/test_disk.c
@@ -77,7 +77,6 @@ static bool log_init(void)
 {
     int h;
 
-    rb->lcd_setmargins(0, 0);
     rb->lcd_getstringsize("A", NULL, &h);
     max_line = LCD_HEIGHT / h;
     line = 0;
diff --git a/apps/plugins/test_fps.c b/apps/plugins/test_fps.c
index 0852e0a9fb..d5b34faeb9 100644
--- a/apps/plugins/test_fps.c
+++ b/apps/plugins/test_fps.c
@@ -57,14 +57,12 @@ static void log_init(void)
 {
     int h;
 
-    rb->lcd_setmargins(0, 0);
     rb->lcd_getstringsize("A", NULL, &h);
     max_line = LCD_HEIGHT / h;
     line = 0;
     rb->lcd_clear_display();
     rb->lcd_update();
 #ifdef HAVE_REMOTE_LCD
-    rb->lcd_remote_setmargins(0, 0);
     rb->lcd_remote_getstringsize("A", NULL, &h);
     remote_max_line = LCD_REMOTE_HEIGHT / h;
     remote_line = 0;
diff --git a/apps/plugins/test_viewports.c b/apps/plugins/test_viewports.c
index bb1b4b9af9..874ed6f52c 100644
--- a/apps/plugins/test_viewports.c
+++ b/apps/plugins/test_viewports.c
@@ -43,8 +43,6 @@ static struct viewport vp0 =
     .height   = 20,
     .font     = FONT_UI,
     .drawmode = DRMODE_SOLID,
-    .xmargin  = 0,
-    .ymargin  = 0,
 #if LCD_DEPTH > 1
     .fg_pattern = LCD_DEFAULT_FG,
     .bg_pattern = BGCOLOR_1,
@@ -64,8 +62,6 @@ static struct viewport vp1 =
     .height   = LCD_HEIGHT / 2,
     .font     = FONT_SYSFIXED,
     .drawmode = DRMODE_SOLID,
-    .xmargin  = 0,
-    .ymargin  = 0,
 #if LCD_DEPTH > 1
     .fg_pattern = LCD_DEFAULT_FG,
     .bg_pattern = LCD_DEFAULT_BG,
@@ -85,8 +81,6 @@ static struct viewport vp2 =
     .height   = (LCD_HEIGHT / 2),
     .font     = FONT_UI,
     .drawmode = DRMODE_SOLID,
-    .xmargin  = 0,
-    .ymargin  = 0,
 #if LCD_DEPTH > 1
     .fg_pattern = FGCOLOR_1,
     .bg_pattern = BGCOLOR_2,
@@ -107,8 +101,6 @@ static struct viewport vp3 =
     .height   = (LCD_HEIGHT / 4),
     .font     = FONT_SYSFIXED,
     .drawmode = DRMODE_SOLID,
-    .xmargin  = 0,
-    .ymargin  = 0,
 #if LCD_DEPTH > 1
     .fg_pattern = LCD_BLACK,
     .bg_pattern = LCD_WHITE,
@@ -130,8 +122,6 @@ static struct viewport rvp0 =
     .height   = LCD_REMOTE_HEIGHT - 10,
     .font     = FONT_SYSFIXED,
     .drawmode = DRMODE_SOLID,
-    .xmargin  = 0,
-    .ymargin  = 0,
 #if LCD_REMOTE_DEPTH > 1
     .fg_pattern = LCD_REMOTE_BLACK,
     .bg_pattern = LCD_REMOTE_LIGHTGRAY,
@@ -146,8 +136,6 @@ static struct viewport rvp1 =
     .height   = LCD_REMOTE_HEIGHT - 10,
     .font     = FONT_SYSFIXED,
     .drawmode = DRMODE_SOLID,
-    .xmargin  = 0,
-    .ymargin  = 0,
 #if LCD_REMOTE_DEPTH > 1
     .fg_pattern = LCD_REMOTE_DEFAULT_FG,
     .bg_pattern = LCD_REMOTE_DEFAULT_BG
@@ -253,8 +241,6 @@ static struct viewport vp0 =
     .y        = 0,
     .width    = 5,
     .height   = 1,
-    .xmargin  = 0,
-    .ymargin  = 0,
 };
 
 static struct viewport vp1 =
@@ -263,8 +249,6 @@ static struct viewport vp1 =
     .y        = 0,
     .width    = 5,
     .height   = 1,
-    .xmargin  = 0,
-    .ymargin  = 0,
 };
 
 static struct viewport vp2 =
@@ -273,8 +257,6 @@ static struct viewport vp2 =
     .y        = 1,
     .width    = LCD_WIDTH,
     .height   = 1,
-    .xmargin  = 0,
-    .ymargin  = 0,
 };
 
 
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c
index d596f43b83..507efac6df 100644
--- a/apps/plugins/viewer.c
+++ b/apps/plugins/viewer.c
@@ -1421,7 +1421,6 @@ static bool viewer_options_menu(void)
     result = menu_run(m);
     menu_exit(m);
 #ifdef HAVE_LCD_BITMAP
-    rb->lcd_setmargins(0,0);
 
     /* Show-scrollbar mode for current view-width mode */
     init_need_scrollbar();
@@ -1459,9 +1458,6 @@ static void viewer_menu(void)
             break;
     }
     menu_exit(m);
-#ifdef HAVE_LCD_BITMAP
-    rb->lcd_setmargins(0,0);
-#endif
     viewer_draw(col);
 }
 
-- 
cgit v1.2.3