summaryrefslogtreecommitdiff
path: root/apps/gui/color_picker.c
diff options
context:
space:
mode:
authorWilliam Wilgus <wilgus.william@gmail.com>2020-10-07 02:01:35 -0400
committerWilliam Wilgus <wilgus.william@gmail.com>2020-10-26 12:28:48 -0400
commit3237ae4a4ff9296a377ff9194a11038da161208f (patch)
treeaf4338c78467b9b0845d76c39da1fbe10f25e23e /apps/gui/color_picker.c
parent12f3ed1699d6bef25bed90ba95cbcc1a6bb4934a (diff)
downloadrockbox-3237ae4a4ff9296a377ff9194a11038da161208f.tar.gz
rockbox-3237ae4a4ff9296a377ff9194a11038da161208f.zip
LCD core move buf ptr and address look up function viewport struct
I'm currently running up against the limitations of the lcd_draw functions I want these functions to be able to be used on any size buffer not just buffers with a stride matching the underlying device [DONE] allow the framebuffer to be decoupled from the device framebuffer [DONE need examples] allow for some simple blit like transformations [DONE] remove the device framebuffer from the plugin api [DONE}ditto remote framebuffer [DONE] remove _viewport_get_framebuffer you can call struct *vp = lcd_set_viewport(NULL) and vp->buffer->fb_ptr while remote lcds may compile (and work in the sim) its not been tested on targets [FIXED] backdrops need work to be screen agnostic [FIXED] screen statusbar is not being combined into the main viewport correctly yet [FIXED] screen elements are displayed incorrectly after switch to void* [FIXED] core didn't restore proper viewport on splash etc. [NEEDS TESTING] remote lcd garbled data [FIXED] osd lib garbled screen on bmp_part [FIXED] grey_set_vp needs to return old viewport like lcd_set_viewport [FIXED] Viewport update now handles viewports with differing buffers/strides by copying to the main buffer [FIXED] splash on top of WPS leaves old framebuffer data (doesn't redraw) [UPDATE] refined this a bit more to have clear_viewport set the clean bit and have skin_render do its own screen clear scrolling viewports no longer trigger wps refresh also fixed a bug where guisyncyesno was displaying and then disappearing [ADDED!] New LCD macros that allow you to create properly size frame buffers in you desired size without wasting bytes (LCD_ and LCD_REMOTE_) LCD_STRIDE(w, h) same as STRIDE_MAIN LCD_FBSTRIDE(w, h) returns target specific stride for a buffer W x H LCD_NBELEMS(w, h) returns the number of fb_data sized elemenst needed for a buffer W x H LCD_NATIVE_STRIDE(s) conversion between rockbox native vertical and lcd native stride (2bitH) test_viewports.c has an example of usage [FIXED!!] 2bit targets don't respect non-native strides [FIXED] Few define snags Change-Id: I0d04c3834e464eca84a5a715743a297a0cefd0af
Diffstat (limited to 'apps/gui/color_picker.c')
-rw-r--r--apps/gui/color_picker.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/gui/color_picker.c b/apps/gui/color_picker.c
index 03096e5589..a32f1ee179 100644
--- a/apps/gui/color_picker.c
+++ b/apps/gui/color_picker.c
@@ -164,7 +164,7 @@ static void draw_screen(struct screen *display, char *title,
164 struct viewport vp; 164 struct viewport vp;
165 165
166 viewport_set_defaults(&vp, display->screen_type); 166 viewport_set_defaults(&vp, display->screen_type);
167 display->set_viewport(&vp); 167 struct viewport * last_vp = display->set_viewport(&vp);
168 168
169 display->clear_viewport(); 169 display->clear_viewport();
170 170
@@ -323,7 +323,7 @@ static void draw_screen(struct screen *display, char *title,
323 } 323 }
324 324
325 display->update_viewport(); 325 display->update_viewport();
326 display->set_viewport(NULL); 326 display->set_viewport(last_vp);
327} 327}
328 328
329#ifdef HAVE_TOUCHSCREEN 329#ifdef HAVE_TOUCHSCREEN
@@ -341,7 +341,7 @@ static int touchscreen_slider(struct screen *display,
341 struct viewport vp; 341 struct viewport vp;
342 342
343 viewport_set_defaults(&vp, display->screen_type); 343 viewport_set_defaults(&vp, display->screen_type);
344 display->set_viewport(&vp); 344 struct viewport *last_vp = display->set_viewport(&vp);
345 345
346 button = action_get_touchscreen_press_in_vp(&x, &y, &vp); 346 button = action_get_touchscreen_press_in_vp(&x, &y, &vp);
347 if (button == ACTION_UNKNOWN || button == BUTTON_NONE) 347 if (button == ACTION_UNKNOWN || button == BUTTON_NONE)
@@ -373,7 +373,7 @@ static int touchscreen_slider(struct screen *display,
373 char_height*2 + /* + margins for bottom */ 373 char_height*2 + /* + margins for bottom */
374 MARGIN_BOTTOM; /* colored rectangle */ 374 MARGIN_BOTTOM; /* colored rectangle */
375 375
376 display->set_viewport(NULL); 376 display->set_viewport(last_vp);
377 377
378 if (y < text_top) 378 if (y < text_top)
379 { 379 {