Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/c6eea438ac6698f60bc4c... ...commit http://git.netsurf-browser.org/netsurf.git/commit/c6eea438ac6698f60bc4c7f... ...tree http://git.netsurf-browser.org/netsurf.git/tree/c6eea438ac6698f60bc4c7f1d... The branch, master has been updated via c6eea438ac6698f60bc4c7f1d490db1c599f5488 (commit) from 7c89bc0d53b4b9a4d23fabed13d323eab3544b24 (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/commit/?id=c6eea438ac6698f60bc... commit c6eea438ac6698f60bc4c7f1d490db1c599f5488 Author: John-Mark Bell <jmb(a)netsurf-browser.org&gt; Commit: Michael Drake <tlsa(a)netsurf-browser.org&gt; RISC OS: Allow text selection in URL bar (RO5.28 onwards) diff --git a/frontends/riscos/gui/url_bar.c b/frontends/riscos/gui/url_bar.c index 8802db7..99a90f5 100644 --- a/frontends/riscos/gui/url_bar.c +++ b/frontends/riscos/gui/url_bar.c @@ -351,9 +351,12 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar) if (url_bar->display) { icon.icon.flags |= (wimp_BUTTON_NEVER << wimp_ICON_BUTTON_TYPE_SHIFT); - } else { + } else if (!ns_wimp_has_text_selection()) { icon.icon.flags |= (wimp_BUTTON_WRITE_CLICK_DRAG << wimp_ICON_BUTTON_TYPE_SHIFT); + } else { + icon.icon.flags |= (wimp_BUTTON_WRITABLE << + wimp_ICON_BUTTON_TYPE_SHIFT); } error = xwimp_create_icon(&icon, &url_bar->text.icon); if (error) { ----------------------------------------------------------------------- Summary of changes: frontends/riscos/gui/url_bar.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frontends/riscos/gui/url_bar.c b/frontends/riscos/gui/url_bar.c index 8802db7..99a90f5 100644 --- a/frontends/riscos/gui/url_bar.c +++ b/frontends/riscos/gui/url_bar.c @@ -351,9 +351,12 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar) if (url_bar->display) { icon.icon.flags |= (wimp_BUTTON_NEVER << wimp_ICON_BUTTON_TYPE_SHIFT); - } else { + } else if (!ns_wimp_has_text_selection()) { icon.icon.flags |= (wimp_BUTTON_WRITE_CLICK_DRAG << wimp_ICON_BUTTON_TYPE_SHIFT); + } else { + icon.icon.flags |= (wimp_BUTTON_WRITABLE << + wimp_ICON_BUTTON_TYPE_SHIFT); } error = xwimp_create_icon(&icon, &url_bar->text.icon); if (error) { -- NetSurf Browser