From 3cead4e8670b4ceb3f5010bd2aaac5d5aa0bd009 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Tue, 3 Nov 2020 09:54:22 +0000 Subject: risc os: Don't swallow URL bar drags if the OS supports text-selection. It should still be possible to drag save the URL from the favicon. --- frontends/riscos/gui/url_bar.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'frontends/riscos/gui/url_bar.c') diff --git a/frontends/riscos/gui/url_bar.c b/frontends/riscos/gui/url_bar.c index 15aab3ea5..63193a43f 100644 --- a/frontends/riscos/gui/url_bar.c +++ b/frontends/riscos/gui/url_bar.c @@ -40,6 +40,7 @@ #include "riscos/url_suggest.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" +#include "riscos/wimputils.h" #include "riscos/window.h" #include "riscos/ucstables.h" #include "riscos/filetype.h" @@ -983,11 +984,13 @@ ro_gui_url_bar_click(struct url_bar *url_bar, */ if (pointer->buttons == wimp_DRAG_SELECT || pointer->buttons == wimp_DRAG_ADJUST) { - if (pointer->i == url_bar->text.icon) { - if (action != NULL) { - *action = TOOLBAR_URL_DRAG_URL; + if (ns_wimp_has_text_selection()) { + if (pointer->i == url_bar->text.icon) { + if (action != NULL) { + *action = TOOLBAR_URL_DRAG_URL; + } + return true; } - return true; } if (is_point_in_box(&pos, &url_bar->favicon.extent)) { -- cgit v1.2.3