summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHristo Kovachev <bger@rockbox.org>2006-04-04 07:01:24 +0000
committerHristo Kovachev <bger@rockbox.org>2006-04-04 07:01:24 +0000
commit23dc42ce459c9bc1fdc191b4e964ea7c7fd56153 (patch)
tree8b7e36c1089d9553c9d539d427142a8a79c4772a
parent0f842a16e50c455e0975ca07efba20a99ee1601d (diff)
downloadrockbox-23dc42ce459c9bc1fdc191b4e964ea7c7fd56153.tar.gz
rockbox-23dc42ce459c9bc1fdc191b4e964ea7c7fd56153.zip
Use the display->width property instead of the hardcoded LCD_WIDTH. Now the quickscreen is displayed correctly on the LCD remotes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9482 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/quickscreen.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c
index 0cee6fd927..24ab725e09 100644
--- a/apps/gui/quickscreen.c
+++ b/apps/gui/quickscreen.c
@@ -75,21 +75,22 @@ void gui_quickscreen_draw(struct gui_quickscreen * qs, struct screen * display)
75 title=(unsigned char *)qs->right_option->title; 75 title=(unsigned char *)qs->right_option->title;
76 snprintf(line_text, sizeof(line_text), "%s %s", title, left_right_title); 76 snprintf(line_text, sizeof(line_text), "%s %s", title, left_right_title);
77 display->getstringsize(line_text, &w, NULL); 77 display->getstringsize(line_text, &w, NULL);
78 if(w > LCD_WIDTH-8) 78 if(w > display->width - 8)
79 { 79 {
80 display->puts_scroll(2, 2+!statusbar, line_text); 80 display->puts_scroll(2, 2+!statusbar, line_text);
81 display->mono_bitmap(bitmap_icons_7x8[Icon_FastForward], 1, 24, 7, 8); 81 display->mono_bitmap(bitmap_icons_7x8[Icon_FastForward], 1, 24, 7, 8);
82 } 82 }
83 else 83 else
84 { 84 {
85 display->putsxy(LCD_WIDTH-w-12, 24, line_text); 85 display->putsxy(display->width - w - 12, 24, line_text);
86 display->mono_bitmap(bitmap_icons_7x8[Icon_FastForward], LCD_WIDTH-8, 24, 7, 8); 86 display->mono_bitmap(bitmap_icons_7x8[Icon_FastForward],
87 display->width - 8, 24, 7, 8);
87 } 88 }
88 display->getstringsize(option, &w, NULL); 89 display->getstringsize(option, &w, NULL);
89 if(w > LCD_WIDTH) 90 if(w > display->width)
90 display->puts_scroll(0, 3+!statusbar, option); 91 display->puts_scroll(0, 3+!statusbar, option);
91 else 92 else
92 display->putsxy(LCD_WIDTH-w-12, 32, option); 93 display->putsxy(display->width -w-12, 32, option);
93 94
94 /* Displays the third line of text */ 95 /* Displays the third line of text */
95 option=(unsigned char *)option_select_get_text(qs->bottom_option, buffer, 96 option=(unsigned char *)option_select_get_text(qs->bottom_option, buffer,
@@ -97,17 +98,17 @@ void gui_quickscreen_draw(struct gui_quickscreen * qs, struct screen * display)
97 title=(unsigned char *)qs->bottom_option->title; 98 title=(unsigned char *)qs->bottom_option->title;
98 99
99 display->getstringsize(title, &w, NULL); 100 display->getstringsize(title, &w, NULL);
100 if(w > LCD_WIDTH) 101 if(w > display->width)
101 display->puts_scroll(0, 4+!statusbar, line_text); 102 display->puts_scroll(0, 4+!statusbar, line_text);
102 else 103 else
103 display->putsxy(LCD_WIDTH/2-w/2, 40, title); 104 display->putsxy(display->width/2-w/2, 40, title);
104 105
105 display->getstringsize(option, &w, NULL); 106 display->getstringsize(option, &w, NULL);
106 if(w > LCD_WIDTH) 107 if(w > display->width)
107 display->puts_scroll(0, 5+!statusbar, option); 108 display->puts_scroll(0, 5+!statusbar, option);
108 else 109 else
109 display->putsxy(LCD_WIDTH/2-w/2, 48, option); 110 display->putsxy(display->width/2-w/2, 48, option);
110 display->mono_bitmap(bitmap_icons_7x8[Icon_DownArrow], LCD_WIDTH/2-4, 56, 7, 8); 111 display->mono_bitmap(bitmap_icons_7x8[Icon_DownArrow], display->width/2-4, 56, 7, 8);
111 112
112 gui_textarea_update(display); 113 gui_textarea_update(display);
113 display->setfont(FONT_UI); 114 display->setfont(FONT_UI);