summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2023-02-14 20:10:38 +0100
committerWilliam Wilgus <me.theuser@yahoo.com>2023-02-15 22:43:33 -0500
commite7a01ca4b2d4935af8d2b4c359fd0ee4aa85f2e2 (patch)
treee20c78b84c2fa0b454cf11404d332af8a882afe7 /apps
parentff98a54cd954360be7e0770cfc987ce33447aa10 (diff)
downloadrockbox-e7a01ca4b2d4935af8d2b4c359fd0ee4aa85f2e2.tar.gz
rockbox-e7a01ca4b2d4935af8d2b4c359fd0ee4aa85f2e2.zip
usb screen: honor HAVE_LCD_SPLIT
Clip+ displays the logo with the LCD split inbetween. Calculate the y offset to be directly after the split if possible. Thanks go to William Wilgus for fixing a similar issue and pointing me to macros I was looking for. Change-Id: I2183aec1149ce74ffb840716910d2051e4a284ed
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/usb_screen.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c
index 31321ec005..fb59f820b6 100644
--- a/apps/gui/usb_screen.c
+++ b/apps/gui/usb_screen.c
@@ -41,6 +41,7 @@
41#include "skin_engine/skin_engine.h" 41#include "skin_engine/skin_engine.h"
42#include "playlist.h" 42#include "playlist.h"
43#include "misc.h" 43#include "misc.h"
44#include "icons.h"
44 45
45#include "bitmaps/usblogo.h" 46#include "bitmaps/usblogo.h"
46 47
@@ -155,7 +156,24 @@ static void usb_screen_fix_viewports(struct screen *screen,
155 156
156 *logo = *parent; 157 *logo = *parent;
157 logo->x = parent->x + parent->width - logo_width; 158 logo->x = parent->x + parent->width - logo_width;
159#ifdef HAVE_LCD_SPLIT
160 switch (statusbar_position(screen))
161 {
162 /* start beyond split */
163 case STATUSBAR_OFF:
164 logo->y = parent->y + LCD_SPLIT_POS;
165 break;
166 case STATUSBAR_TOP:
167 logo->y = parent->y + LCD_SPLIT_POS - STATUSBAR_HEIGHT;
168 break;
169 /* start at the top for maximum space */
170 default:
171 logo->y = parent->y;
172 break;
173 }
174#else
158 logo->y = parent->y + (parent->height - logo_height) / 2; 175 logo->y = parent->y + (parent->height - logo_height) / 2;
176#endif
159 logo->width = logo_width; 177 logo->width = logo_width;
160 logo->height = logo_height; 178 logo->height = logo_height;
161 179