From 40a754a362723d332512c59beaad089c740e5ce6 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Wed, 1 Aug 2012 21:48:16 +0100 Subject: Convert move pointer during build and use it for page drag-scroll. --- framebuffer/Makefile.target | 1 + framebuffer/gui.c | 5 +++++ framebuffer/image_data.h | 1 + 3 files changed, 7 insertions(+) (limited to 'framebuffer') diff --git a/framebuffer/Makefile.target b/framebuffer/Makefile.target index af5891bc2..3992affe2 100644 --- a/framebuffer/Makefile.target +++ b/framebuffer/Makefile.target @@ -101,6 +101,7 @@ FB_IMAGE_hand_image := framebuffer/res/pointers/point.png FB_IMAGE_caret_image := framebuffer/res/pointers/caret.png FB_IMAGE_menu_image := framebuffer/res/pointers/menu.png FB_IMAGE_progress_image := framebuffer/res/pointers/progress.png +FB_IMAGE_move_image := framebuffer/res/pointers/move.png FB_IMAGE_throbber0 := framebuffer/res/throbber/throbber0.png FB_IMAGE_throbber1 := framebuffer/res/throbber/throbber1.png diff --git a/framebuffer/gui.c b/framebuffer/gui.c index f7b65337b..b098702d0 100644 --- a/framebuffer/gui.c +++ b/framebuffer/gui.c @@ -653,6 +653,7 @@ fb_browser_window_click(fbtk_widget_t *widget, fbtk_callback_info *cbi) if (gui_drag.state == GUI_DRAG_DRAG) { /* End of a drag, rather than click */ gui_drag.state = GUI_DRAG_NONE; + framebuffer_set_cursor(&pointer_image); break; } /* This is a click; @@ -1529,6 +1530,10 @@ gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape) framebuffer_set_cursor(&progress_image); break; + case GUI_POINTER_MOVE: + framebuffer_set_cursor(&move_image); + break; + default: framebuffer_set_cursor(&pointer_image); break; diff --git a/framebuffer/image_data.h b/framebuffer/image_data.h index 5ebac91ed..a6d8b6a17 100644 --- a/framebuffer/image_data.h +++ b/framebuffer/image_data.h @@ -42,6 +42,7 @@ extern struct fbtk_bitmap pointer_image; extern struct fbtk_bitmap hand_image; extern struct fbtk_bitmap caret_image; extern struct fbtk_bitmap menu_image; +extern struct fbtk_bitmap move_image; extern struct fbtk_bitmap progress_image; extern struct fbtk_bitmap throbber0; -- cgit v1.2.3