diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2008-06-23 13:20:35 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2008-06-23 13:20:35 +0000 |
commit | bdbdb97f19655a635a2d37f81f9fe1e31f9162b2 (patch) | |
tree | ea5672478b70e550910bc179a7644afa70c0d057 /apps/plugins | |
parent | c1b8df05e1def3096ff6d2ea55f23b2e72936fce (diff) | |
download | rockbox-bdbdb97f19655a635a2d37f81f9fe1e31f9162b2.tar.gz rockbox-bdbdb97f19655a635a2d37f81f9fe1e31f9162b2.zip |
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
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/solitaire.c | 2 | ||||
-rw-r--r-- | apps/plugins/test_codec.c | 1 | ||||
-rw-r--r-- | apps/plugins/test_disk.c | 1 | ||||
-rw-r--r-- | apps/plugins/test_fps.c | 2 | ||||
-rw-r--r-- | apps/plugins/test_viewports.c | 18 | ||||
-rw-r--r-- | apps/plugins/viewer.c | 4 |
6 files changed, 0 insertions, 28 deletions
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) | |||
744 | break; | 744 | break; |
745 | 745 | ||
746 | case 2: | 746 | case 2: |
747 | rb->lcd_setmargins(0, 0); | ||
748 | if (solitaire_help() == HELP_USB) | 747 | if (solitaire_help() == HELP_USB) |
749 | result = MENU_USB; | 748 | result = MENU_USB; |
750 | break; | 749 | break; |
@@ -766,7 +765,6 @@ int solitaire_menu(bool in_game) | |||
766 | } | 765 | } |
767 | } | 766 | } |
768 | menu_exit(m); | 767 | menu_exit(m); |
769 | rb->lcd_setmargins(0, 0); | ||
770 | return result; | 768 | return result; |
771 | } | 769 | } |
772 | 770 | ||
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) | |||
44 | { | 44 | { |
45 | int h; | 45 | int h; |
46 | 46 | ||
47 | rb->lcd_setmargins(0, 0); | ||
48 | rb->lcd_getstringsize("A", NULL, &h); | 47 | rb->lcd_getstringsize("A", NULL, &h); |
49 | max_line = LCD_HEIGHT / h; | 48 | max_line = LCD_HEIGHT / h; |
50 | line = 0; | 49 | 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) | |||
77 | { | 77 | { |
78 | int h; | 78 | int h; |
79 | 79 | ||
80 | rb->lcd_setmargins(0, 0); | ||
81 | rb->lcd_getstringsize("A", NULL, &h); | 80 | rb->lcd_getstringsize("A", NULL, &h); |
82 | max_line = LCD_HEIGHT / h; | 81 | max_line = LCD_HEIGHT / h; |
83 | line = 0; | 82 | 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) | |||
57 | { | 57 | { |
58 | int h; | 58 | int h; |
59 | 59 | ||
60 | rb->lcd_setmargins(0, 0); | ||
61 | rb->lcd_getstringsize("A", NULL, &h); | 60 | rb->lcd_getstringsize("A", NULL, &h); |
62 | max_line = LCD_HEIGHT / h; | 61 | max_line = LCD_HEIGHT / h; |
63 | line = 0; | 62 | line = 0; |
64 | rb->lcd_clear_display(); | 63 | rb->lcd_clear_display(); |
65 | rb->lcd_update(); | 64 | rb->lcd_update(); |
66 | #ifdef HAVE_REMOTE_LCD | 65 | #ifdef HAVE_REMOTE_LCD |
67 | rb->lcd_remote_setmargins(0, 0); | ||
68 | rb->lcd_remote_getstringsize("A", NULL, &h); | 66 | rb->lcd_remote_getstringsize("A", NULL, &h); |
69 | remote_max_line = LCD_REMOTE_HEIGHT / h; | 67 | remote_max_line = LCD_REMOTE_HEIGHT / h; |
70 | remote_line = 0; | 68 | 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 = | |||
43 | .height = 20, | 43 | .height = 20, |
44 | .font = FONT_UI, | 44 | .font = FONT_UI, |
45 | .drawmode = DRMODE_SOLID, | 45 | .drawmode = DRMODE_SOLID, |
46 | .xmargin = 0, | ||
47 | .ymargin = 0, | ||
48 | #if LCD_DEPTH > 1 | 46 | #if LCD_DEPTH > 1 |
49 | .fg_pattern = LCD_DEFAULT_FG, | 47 | .fg_pattern = LCD_DEFAULT_FG, |
50 | .bg_pattern = BGCOLOR_1, | 48 | .bg_pattern = BGCOLOR_1, |
@@ -64,8 +62,6 @@ static struct viewport vp1 = | |||
64 | .height = LCD_HEIGHT / 2, | 62 | .height = LCD_HEIGHT / 2, |
65 | .font = FONT_SYSFIXED, | 63 | .font = FONT_SYSFIXED, |
66 | .drawmode = DRMODE_SOLID, | 64 | .drawmode = DRMODE_SOLID, |
67 | .xmargin = 0, | ||
68 | .ymargin = 0, | ||
69 | #if LCD_DEPTH > 1 | 65 | #if LCD_DEPTH > 1 |
70 | .fg_pattern = LCD_DEFAULT_FG, | 66 | .fg_pattern = LCD_DEFAULT_FG, |
71 | .bg_pattern = LCD_DEFAULT_BG, | 67 | .bg_pattern = LCD_DEFAULT_BG, |
@@ -85,8 +81,6 @@ static struct viewport vp2 = | |||
85 | .height = (LCD_HEIGHT / 2), | 81 | .height = (LCD_HEIGHT / 2), |
86 | .font = FONT_UI, | 82 | .font = FONT_UI, |
87 | .drawmode = DRMODE_SOLID, | 83 | .drawmode = DRMODE_SOLID, |
88 | .xmargin = 0, | ||
89 | .ymargin = 0, | ||
90 | #if LCD_DEPTH > 1 | 84 | #if LCD_DEPTH > 1 |
91 | .fg_pattern = FGCOLOR_1, | 85 | .fg_pattern = FGCOLOR_1, |
92 | .bg_pattern = BGCOLOR_2, | 86 | .bg_pattern = BGCOLOR_2, |
@@ -107,8 +101,6 @@ static struct viewport vp3 = | |||
107 | .height = (LCD_HEIGHT / 4), | 101 | .height = (LCD_HEIGHT / 4), |
108 | .font = FONT_SYSFIXED, | 102 | .font = FONT_SYSFIXED, |
109 | .drawmode = DRMODE_SOLID, | 103 | .drawmode = DRMODE_SOLID, |
110 | .xmargin = 0, | ||
111 | .ymargin = 0, | ||
112 | #if LCD_DEPTH > 1 | 104 | #if LCD_DEPTH > 1 |
113 | .fg_pattern = LCD_BLACK, | 105 | .fg_pattern = LCD_BLACK, |
114 | .bg_pattern = LCD_WHITE, | 106 | .bg_pattern = LCD_WHITE, |
@@ -130,8 +122,6 @@ static struct viewport rvp0 = | |||
130 | .height = LCD_REMOTE_HEIGHT - 10, | 122 | .height = LCD_REMOTE_HEIGHT - 10, |
131 | .font = FONT_SYSFIXED, | 123 | .font = FONT_SYSFIXED, |
132 | .drawmode = DRMODE_SOLID, | 124 | .drawmode = DRMODE_SOLID, |
133 | .xmargin = 0, | ||
134 | .ymargin = 0, | ||
135 | #if LCD_REMOTE_DEPTH > 1 | 125 | #if LCD_REMOTE_DEPTH > 1 |
136 | .fg_pattern = LCD_REMOTE_BLACK, | 126 | .fg_pattern = LCD_REMOTE_BLACK, |
137 | .bg_pattern = LCD_REMOTE_LIGHTGRAY, | 127 | .bg_pattern = LCD_REMOTE_LIGHTGRAY, |
@@ -146,8 +136,6 @@ static struct viewport rvp1 = | |||
146 | .height = LCD_REMOTE_HEIGHT - 10, | 136 | .height = LCD_REMOTE_HEIGHT - 10, |
147 | .font = FONT_SYSFIXED, | 137 | .font = FONT_SYSFIXED, |
148 | .drawmode = DRMODE_SOLID, | 138 | .drawmode = DRMODE_SOLID, |
149 | .xmargin = 0, | ||
150 | .ymargin = 0, | ||
151 | #if LCD_REMOTE_DEPTH > 1 | 139 | #if LCD_REMOTE_DEPTH > 1 |
152 | .fg_pattern = LCD_REMOTE_DEFAULT_FG, | 140 | .fg_pattern = LCD_REMOTE_DEFAULT_FG, |
153 | .bg_pattern = LCD_REMOTE_DEFAULT_BG | 141 | .bg_pattern = LCD_REMOTE_DEFAULT_BG |
@@ -253,8 +241,6 @@ static struct viewport vp0 = | |||
253 | .y = 0, | 241 | .y = 0, |
254 | .width = 5, | 242 | .width = 5, |
255 | .height = 1, | 243 | .height = 1, |
256 | .xmargin = 0, | ||
257 | .ymargin = 0, | ||
258 | }; | 244 | }; |
259 | 245 | ||
260 | static struct viewport vp1 = | 246 | static struct viewport vp1 = |
@@ -263,8 +249,6 @@ static struct viewport vp1 = | |||
263 | .y = 0, | 249 | .y = 0, |
264 | .width = 5, | 250 | .width = 5, |
265 | .height = 1, | 251 | .height = 1, |
266 | .xmargin = 0, | ||
267 | .ymargin = 0, | ||
268 | }; | 252 | }; |
269 | 253 | ||
270 | static struct viewport vp2 = | 254 | static struct viewport vp2 = |
@@ -273,8 +257,6 @@ static struct viewport vp2 = | |||
273 | .y = 1, | 257 | .y = 1, |
274 | .width = LCD_WIDTH, | 258 | .width = LCD_WIDTH, |
275 | .height = 1, | 259 | .height = 1, |
276 | .xmargin = 0, | ||
277 | .ymargin = 0, | ||
278 | }; | 260 | }; |
279 | 261 | ||
280 | 262 | ||
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) | |||
1421 | result = menu_run(m); | 1421 | result = menu_run(m); |
1422 | menu_exit(m); | 1422 | menu_exit(m); |
1423 | #ifdef HAVE_LCD_BITMAP | 1423 | #ifdef HAVE_LCD_BITMAP |
1424 | rb->lcd_setmargins(0,0); | ||
1425 | 1424 | ||
1426 | /* Show-scrollbar mode for current view-width mode */ | 1425 | /* Show-scrollbar mode for current view-width mode */ |
1427 | init_need_scrollbar(); | 1426 | init_need_scrollbar(); |
@@ -1459,9 +1458,6 @@ static void viewer_menu(void) | |||
1459 | break; | 1458 | break; |
1460 | } | 1459 | } |
1461 | menu_exit(m); | 1460 | menu_exit(m); |
1462 | #ifdef HAVE_LCD_BITMAP | ||
1463 | rb->lcd_setmargins(0,0); | ||
1464 | #endif | ||
1465 | viewer_draw(col); | 1461 | viewer_draw(col); |
1466 | } | 1462 | } |
1467 | 1463 | ||