diff options
-rw-r--r-- | Makefile.resources | 1 | ||||
-rw-r--r-- | framebuffer/gui.c | 6 | ||||
-rw-r--r-- | framebuffer/image_data.h | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.resources b/Makefile.resources index b806c1fe0..d44697fad 100644 --- a/Makefile.resources +++ b/Makefile.resources @@ -34,6 +34,7 @@ FB_IMAGE_pointer_image := framebuffer/res/pointers/default.png 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_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 e3b93c40c..65080db8a 100644 --- a/framebuffer/gui.c +++ b/framebuffer/gui.c @@ -111,7 +111,7 @@ fb_queue_redraw(struct fbtk_widget_s *widget, int x0, int y0, int x1, int y1) } else { bwidget->redraw_box.y0 = bwidget->redraw_box.x0 = INT_MAX; bwidget->redraw_box.y1 = bwidget->redraw_box.x1 = -(INT_MAX); - bwidget->redraw_required = false; + bwidget->redraw_required = false; } } @@ -1087,6 +1087,10 @@ void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape) framebuffer_set_cursor(&menu_image); break; + case GUI_POINTER_PROGRESS: + framebuffer_set_cursor(&progress_image); + break; + default: framebuffer_set_cursor(&pointer_image); break; diff --git a/framebuffer/image_data.h b/framebuffer/image_data.h index 50b5eae7d..fcf1c366f 100644 --- a/framebuffer/image_data.h +++ b/framebuffer/image_data.h @@ -39,6 +39,7 @@ extern struct bitmap pointer_image; extern struct bitmap hand_image; extern struct bitmap caret_image; extern struct bitmap menu_image; +extern struct bitmap progress_image; extern struct bitmap throbber0; extern struct bitmap throbber1; |