diff options
| author | Christian Soffke <christian.soffke@gmail.com> | 2023-06-07 05:13:36 +0200 |
|---|---|---|
| committer | Christian Soffke <christian.soffke@gmail.com> | 2023-06-09 03:15:10 +0200 |
| commit | 666a836227fff725cba0884edd6113b5d548c7dd (patch) | |
| tree | 7b3972c8077922a22c3ff896cb8efca6a1369612 | |
| parent | bd339dabacb0966830baf2ecc3320d0b412c0507 (diff) | |
| download | rockbox-666a836227.tar.gz rockbox-666a836227.zip | |
Skin Engine: Enable dithering for images drawn onto backdrop layer
Backdrop images loaded using %X(filename) already had
dithering enabled, but images loaded using the %x tag
in viewports annotated with %VB did not.
Change-Id: I9c6d11d8e7ab41a53eb9e453d78ae0dc58cb947b
| -rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 15 | ||||
| -rw-r--r-- | apps/gui/skin_engine/wps_internals.h | 1 |
2 files changed, 13 insertions, 3 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 6cc3c596b0..b801eaae12 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -426,9 +426,16 @@ static int parse_image_load(struct skin_element *element, img->buflib_handle = -1; img->is_9_segment = false; img->loaded = false; + img->dither = false; if (token->type == SKIN_TOKEN_IMAGE_DISPLAY) + { token->value.data = PTRTOSKINOFFSET(skin_buffer, img); +#ifdef HAVE_BACKDROP_IMAGE + if (curr_vp) + img->dither = curr_vp->output_to_backdrop_buffer; +#endif + } if (!strcmp(img->bm.data, "__list_icons__")) { @@ -1910,11 +1917,12 @@ static int buflib_move_callback(int handle, void* current, void* new) } #endif -static int load_skin_bmp(struct wps_data *wps_data, struct bitmap *bitmap, char* bmpdir) +static int load_skin_bmp(struct wps_data *wps_data, struct gui_img *img, char* bmpdir) { (void)wps_data; /* only needed for remote targets */ char img_path[MAX_PATH]; + struct bitmap *bitmap = &img->bm; get_image_filename(bitmap->data, bmpdir, img_path, sizeof(img_path)); @@ -1938,7 +1946,8 @@ static int load_skin_bmp(struct wps_data *wps_data, struct bitmap *bitmap, char* bmpformat = FORMAT_ANY|FORMAT_REMOTE; else #endif - bmpformat = FORMAT_ANY|FORMAT_TRANSPARENT; + bmpformat = img->dither ? FORMAT_ANY|FORMAT_DITHER|FORMAT_TRANSPARENT : + FORMAT_ANY|FORMAT_TRANSPARENT; handle = core_load_bmp(img_path, bitmap, bmpformat, &buf_reqd, &buflib_ops); if (handle != CLB_ALOC_ERR) @@ -1990,7 +1999,7 @@ static bool load_skin_bitmaps(struct wps_data *wps_data, char *bmpdir) char path[MAX_PATH]; int handle; strcpy(path, img->bm.data); - handle = load_skin_bmp(wps_data, &img->bm, bmpdir); + handle = load_skin_bmp(wps_data, img, bmpdir); img->buflib_handle = handle; img->loaded = img->buflib_handle > 0; diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h index 6b9719282e..8ad8325e66 100644 --- a/apps/gui/skin_engine/wps_internals.h +++ b/apps/gui/skin_engine/wps_internals.h @@ -102,6 +102,7 @@ struct gui_img { int display; bool using_preloaded_icons; /* using the icon system instead of a bmp */ bool is_9_segment; + bool dither; }; struct image_display { |