summaryrefslogtreecommitdiff
path: root/framebuffer
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2012-08-01 21:48:16 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2012-08-01 21:48:16 +0100
commit40a754a362723d332512c59beaad089c740e5ce6 (patch)
tree5ed5728534248d0000efa1d7fa93138612acc748 /framebuffer
parentffa3e6bf3565143c3bda79a0198fe47af5c00276 (diff)
downloadnetsurf-40a754a362723d332512c59beaad089c740e5ce6.tar.gz
netsurf-40a754a362723d332512c59beaad089c740e5ce6.tar.bz2
Convert move pointer during build and use it for page drag-scroll.
Diffstat (limited to 'framebuffer')
-rw-r--r--framebuffer/Makefile.target1
-rw-r--r--framebuffer/gui.c5
-rw-r--r--framebuffer/image_data.h1
3 files changed, 7 insertions, 0 deletions
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;