diff options
author | Thomas Martitz <kugel@rockbox.org> | 2013-12-28 15:10:46 +0100 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2014-01-07 11:49:53 +0100 |
commit | 5752d029fd80e87fe522d7d5e952a56dc371d65e (patch) | |
tree | 6ae883172947987e0ba5eb59259db9437dedfc1e | |
parent | bc9a45b05f2b16e3413e53db5a33515c68933738 (diff) | |
download | rockbox-5752d029fd80e87fe522d7d5e952a56dc371d65e.tar.gz rockbox-5752d029fd80e87fe522d7d5e952a56dc371d65e.zip |
icons: Provide accessors to the icon format (mono or native).
This is needed by the upcoming put_line() api to apply different drawmodes
depending on the format.
Change-Id: I626a7369a6e75c9c46af1ca5e4f1a9d401899b68
-rw-r--r-- | apps/gui/icon.c | 14 | ||||
-rw-r--r-- | apps/gui/icon.h | 8 |
2 files changed, 22 insertions, 0 deletions
diff --git a/apps/gui/icon.c b/apps/gui/icon.c index e943338af5..73f37e5140 100644 --- a/apps/gui/icon.c +++ b/apps/gui/icon.c | |||
@@ -277,3 +277,17 @@ int get_icon_height(enum screen_type screen_type) | |||
277 | { | 277 | { |
278 | return ICON_HEIGHT(screen_type); | 278 | return ICON_HEIGHT(screen_type); |
279 | } | 279 | } |
280 | |||
281 | #if (LCD_DEPTH > 1) || defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1) | ||
282 | int get_icon_format(enum screen_type screen) | ||
283 | { | ||
284 | const struct bitmap *iconset; | ||
285 | |||
286 | if (iconsets[Iconset_user][screen].loaded) | ||
287 | iconset = &iconsets[Iconset_user][screen].bmp; | ||
288 | else | ||
289 | iconset = inbuilt_iconset[screen]; | ||
290 | |||
291 | return iconset->format; | ||
292 | } | ||
293 | #endif | ||
diff --git a/apps/gui/icon.h b/apps/gui/icon.h index 9304ad9077..e095ccfc4c 100644 --- a/apps/gui/icon.h +++ b/apps/gui/icon.h | |||
@@ -113,6 +113,14 @@ void icons_init(void); | |||
113 | #else | 113 | #else |
114 | int get_icon_width(enum screen_type screen_type); | 114 | int get_icon_width(enum screen_type screen_type); |
115 | int get_icon_height(enum screen_type screen_type); | 115 | int get_icon_height(enum screen_type screen_type); |
116 | int get_icon_format(enum screen_type screen_type); | ||
117 | #endif | ||
118 | |||
119 | #if (LCD_DEPTH > 1) || defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1) \ | ||
120 | && !defined(HAVE_LCD_CHARCELLS) | ||
121 | int get_icon_format(enum screen_type screen_type); | ||
122 | #else | ||
123 | # define get_icon_format(a) FORMAT_MONO | ||
116 | #endif | 124 | #endif |
117 | 125 | ||
118 | 126 | ||