Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/84e1bf89d96c0be4fb811... ...commit http://git.netsurf-browser.org/netsurf.git/commit/84e1bf89d96c0be4fb811a4... ...tree http://git.netsurf-browser.org/netsurf.git/tree/84e1bf89d96c0be4fb811a480... The branch, master has been updated via 84e1bf89d96c0be4fb811a4802a664b7d8aa4e7c (commit) from ae8a3ede3e1e4d139f8e564cf393c1ab8914cd44 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/84e1bf89d96c0be4fb8... commit 84e1bf89d96c0be4fb811a4802a664b7d8aa4e7c Author: Michael Drake <tlsa(a)netsurf-browser.org&gt; Commit: Michael Drake <tlsa(a)netsurf-browser.org&gt; Add OSK icon. diff --git a/framebuffer/Makefile.target b/framebuffer/Makefile.target index 8cca120..71f7fc2 100644 --- a/framebuffer/Makefile.target +++ b/framebuffer/Makefile.target @@ -95,6 +95,7 @@ FB_IMAGE_scrollr := framebuffer/res/icons/scrollr.png FB_IMAGE_scrollu := framebuffer/res/icons/scrollu.png FB_IMAGE_scrolld := framebuffer/res/icons/scrolld.png +FB_IMAGE_osk_image := framebuffer/res/icons/osk.png FB_IMAGE_pointer_image := framebuffer/res/pointers/default.png FB_IMAGE_hand_image := framebuffer/res/pointers/point.png diff --git a/framebuffer/fbtk/osk.c b/framebuffer/fbtk/osk.c index 02c9e45..1d57f15 100644 --- a/framebuffer/fbtk/osk.c +++ b/framebuffer/fbtk/osk.c @@ -173,17 +173,15 @@ fbtk_enable_oskb(fbtk_widget_t *fbtk) fbtk_set_text(widget, kbdbase[kloop].t); } - widget = fbtk_create_text_button(osk, - fbtk_get_width(osk) - furniture_width, - fbtk_get_height(osk) - furniture_width, - furniture_width, - furniture_width, - FB_FRAME_COLOUR, - FB_COLOUR_BLACK, - osk_close, - NULL); - fbtk_set_text(widget, "\xe2\x8c\xa8"); - + widget = fbtk_create_button(osk, + fbtk_get_width(osk) - furniture_width, + fbtk_get_height(osk) - furniture_width, + furniture_width, + furniture_width, + FB_FRAME_COLOUR, + &osk_image, + osk_close, + NULL); } /* exported function documented in fbtk.h */ diff --git a/framebuffer/gui.c b/framebuffer/gui.c index e33df38..3bcc1be 100644 --- a/framebuffer/gui.c +++ b/framebuffer/gui.c @@ -1377,7 +1377,15 @@ create_normal_browser_window(struct gui_window *gw, int furniture_width) FB_FRAME_COLOUR, FB_COLOUR_BLACK, fb_osk_click, NULL); - fbtk_set_text(widget, "\xe2\x8c\xa8"); + widget = fbtk_create_button(gw->window, + fbtk_get_width(gw->window) - furniture_width, + fbtk_get_height(gw->window) - furniture_width, + furniture_width, + furniture_width, + FB_FRAME_COLOUR, + &osk_image, + fb_osk_click, + NULL); } else { widget = fbtk_create_fill(gw->window, fbtk_get_width(gw->window) - furniture_width, diff --git a/framebuffer/image_data.h b/framebuffer/image_data.h index a6d8b6a..cf349f5 100644 --- a/framebuffer/image_data.h +++ b/framebuffer/image_data.h @@ -38,6 +38,8 @@ extern struct fbtk_bitmap scrollr; extern struct fbtk_bitmap scrollu; extern struct fbtk_bitmap scrolld; +extern struct fbtk_bitmap osk_image; + extern struct fbtk_bitmap pointer_image; extern struct fbtk_bitmap hand_image; extern struct fbtk_bitmap caret_image; diff --git a/framebuffer/res/icons/osk.png b/framebuffer/res/icons/osk.png new file mode 100644 index 0000000..1e64fed Binary files /dev/null and b/framebuffer/res/icons/osk.png differ ----------------------------------------------------------------------- Summary of changes: framebuffer/Makefile.target | 1 + framebuffer/fbtk/osk.c | 20 +++++++++----------- framebuffer/gui.c | 10 +++++++++- framebuffer/image_data.h | 2 ++ framebuffer/res/icons/osk.png | Bin 0 -> 262 bytes 5 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 framebuffer/res/icons/osk.png diff --git a/framebuffer/Makefile.target b/framebuffer/Makefile.target index 8cca120..71f7fc2 100644 --- a/framebuffer/Makefile.target +++ b/framebuffer/Makefile.target @@ -95,6 +95,7 @@ FB_IMAGE_scrollr := framebuffer/res/icons/scrollr.png FB_IMAGE_scrollu := framebuffer/res/icons/scrollu.png FB_IMAGE_scrolld := framebuffer/res/icons/scrolld.png +FB_IMAGE_osk_image := framebuffer/res/icons/osk.png FB_IMAGE_pointer_image := framebuffer/res/pointers/default.png FB_IMAGE_hand_image := framebuffer/res/pointers/point.png diff --git a/framebuffer/fbtk/osk.c b/framebuffer/fbtk/osk.c index 02c9e45..1d57f15 100644 --- a/framebuffer/fbtk/osk.c +++ b/framebuffer/fbtk/osk.c @@ -173,17 +173,15 @@ fbtk_enable_oskb(fbtk_widget_t *fbtk) fbtk_set_text(widget, kbdbase[kloop].t); } - widget = fbtk_create_text_button(osk, - fbtk_get_width(osk) - furniture_width, - fbtk_get_height(osk) - furniture_width, - furniture_width, - furniture_width, - FB_FRAME_COLOUR, - FB_COLOUR_BLACK, - osk_close, - NULL); - fbtk_set_text(widget, "\xe2\x8c\xa8"); - + widget = fbtk_create_button(osk, + fbtk_get_width(osk) - furniture_width, + fbtk_get_height(osk) - furniture_width, + furniture_width, + furniture_width, + FB_FRAME_COLOUR, + &osk_image, + osk_close, + NULL); } /* exported function documented in fbtk.h */ diff --git a/framebuffer/gui.c b/framebuffer/gui.c index e33df38..3bcc1be 100644 --- a/framebuffer/gui.c +++ b/framebuffer/gui.c @@ -1377,7 +1377,15 @@ create_normal_browser_window(struct gui_window *gw, int furniture_width) FB_FRAME_COLOUR, FB_COLOUR_BLACK, fb_osk_click, NULL); - fbtk_set_text(widget, "\xe2\x8c\xa8"); + widget = fbtk_create_button(gw->window, + fbtk_get_width(gw->window) - furniture_width, + fbtk_get_height(gw->window) - furniture_width, + furniture_width, + furniture_width, + FB_FRAME_COLOUR, + &osk_image, + fb_osk_click, + NULL); } else { widget = fbtk_create_fill(gw->window, fbtk_get_width(gw->window) - furniture_width, diff --git a/framebuffer/image_data.h b/framebuffer/image_data.h index a6d8b6a..cf349f5 100644 --- a/framebuffer/image_data.h +++ b/framebuffer/image_data.h @@ -38,6 +38,8 @@ extern struct fbtk_bitmap scrollr; extern struct fbtk_bitmap scrollu; extern struct fbtk_bitmap scrolld; +extern struct fbtk_bitmap osk_image; + extern struct fbtk_bitmap pointer_image; extern struct fbtk_bitmap hand_image; extern struct fbtk_bitmap caret_image; diff --git a/framebuffer/res/icons/osk.png b/framebuffer/res/icons/osk.png new file mode 100644 index 0000000..1e64fed Binary files /dev/null and b/framebuffer/res/icons/osk.png differ -- NetSurf Browser