summaryrefslogtreecommitdiff
path: root/apps/gui/skin_engine/skin_render.c
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2013-01-31 07:24:19 +0100
committerThomas Martitz <kugel@rockbox.org>2013-12-14 23:11:31 +0100
commit50eb528bc1f9d2f7b7260eff8b85a5ed5b96e679 (patch)
tree47b53d62c0880a3ea6b9e761efdf0628855d13e0 /apps/gui/skin_engine/skin_render.c
parent26801b3bd8f11fe680146086aa0a2fd12e7de289 (diff)
downloadrockbox-50eb528bc1f9d2f7b7260eff8b85a5ed5b96e679.tar.gz
rockbox-50eb528bc1f9d2f7b7260eff8b85a5ed5b96e679.zip
scroll_engine: Major rework to support pixel-based scrolling and scroll callbacks.
Much of the scrolling work is moved from lcd-bitmap-common to lcd-scroll.c, a small scroll callback routine remains. This callback can potentially be overridden by more extensive scrollers. The callback also gets fed with pixel-based scrolling information, which finally removes the strict line-based nature of the scroll engine. Along with this is the change from scroll_stop_viewport_line() to scroll_stop_viewport_rect() which works on a pixel-based rectangle instead of lines. The ultimate goal is to move most of the scroll work to apps, which can much better decide which line decorations to apply etc. This work is laying the ground work. Change-Id: I3b2885cf7d8696ddd9253d5a9a73318d3d42831a
Diffstat (limited to 'apps/gui/skin_engine/skin_render.c')
-rw-r--r--apps/gui/skin_engine/skin_render.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/apps/gui/skin_engine/skin_render.c b/apps/gui/skin_engine/skin_render.c
index 67f1f0f448..28483cbc49 100644
--- a/apps/gui/skin_engine/skin_render.c
+++ b/apps/gui/skin_engine/skin_render.c
@@ -779,7 +779,9 @@ void skin_render_viewport(struct skin_element* viewport, struct gui_wps *gwps,
779 if (refresh_type && needs_update) 779 if (refresh_type && needs_update)
780 { 780 {
781 if (info.force_redraw) 781 if (info.force_redraw)
782 display->scroll_stop_viewport_line(&skin_viewport->vp, info.line_number); 782 display->scroll_stop_viewport_rect(&skin_viewport->vp,
783 0, info.line_number*display->getcharheight(),
784 skin_viewport->vp.width, display->getcharheight());
783 write_line(display, align, info.line_number, 785 write_line(display, align, info.line_number,
784 info.line_scrolls, info.text_style); 786 info.line_scrolls, info.text_style);
785 } 787 }
@@ -967,8 +969,11 @@ void skin_render_playlistviewer(struct playlistviewer* viewer,
967 /* only update if the line needs to be, and there is something to write */ 969 /* only update if the line needs to be, and there is something to write */
968 if (refresh_type && needs_update) 970 if (refresh_type && needs_update)
969 { 971 {
972 struct viewport *vp = SKINOFFSETTOPTR(skin_buffer, viewer->vp);
970 if (!info.force_redraw) 973 if (!info.force_redraw)
971 display->scroll_stop_viewport_line(&skin_viewport->vp, info.line_number); 974 display->scroll_stop_viewport_rect(vp,
975 0, info.line_number*display->getcharheight(),
976 vp->width, display->getcharheight());
972 write_line(display, align, info.line_number, 977 write_line(display, align, info.line_number,
973 info.line_scrolls, info.text_style); 978 info.line_scrolls, info.text_style);
974 } 979 }