diff options
Diffstat (limited to 'frontends/riscos/toolbar.c')
| -rw-r--r-- | frontends/riscos/toolbar.c | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/frontends/riscos/toolbar.c b/frontends/riscos/toolbar.c index 758c90cc2..c6a882ab6 100644 --- a/frontends/riscos/toolbar.c +++ b/frontends/riscos/toolbar.c @@ -420,7 +420,7 @@ bool ro_toolbar_rebuild(struct toolbar *toolbar) ro_gui_wimp_event_transfer(old_window, toolbar->toolbar_handle); } - /* The help prefix changes from edit to non-edit more. */ + /* The help prefix changes from edit to non-edit mode. */ ro_gui_wimp_event_set_help_prefix(toolbar->toolbar_handle, (toolbar->editing) ? @@ -1115,18 +1115,20 @@ bool ro_toolbar_click(wimp_pointer *pointer) return true; } - /* Nothing else has handled this, so try passing it to the - * URL Complete module. - * - * \TODO -- This should really move into the URL Bar module, as - * URL Complete is really an extension to that. - */ - - if (toolbar->url != NULL && toolbar->url_display && - ro_gui_url_bar_test_for_text_field_click(toolbar->url, - pointer)) { - ro_gui_url_complete_start(toolbar); - return true; + if (pointer->buttons != wimp_DRAG_SELECT && + pointer->buttons != wimp_DRAG_ADJUST) { + /* Nothing else has handled this click, so try passing it to + * the URL Complete module. + * + * \TODO -- This should really move into the URL Bar module, as + * URL Complete is really an extension to that. + */ + if (toolbar->url != NULL && toolbar->url_display && + ro_gui_url_bar_test_for_text_field_click( + toolbar->url, pointer)) { + ro_gui_url_complete_start(toolbar); + return true; + } } return false; @@ -1538,7 +1540,6 @@ void ro_toolbar_start_throbbing(struct toolbar *toolbar) /* This is an exported interface documented in toolbar.h */ - void ro_toolbar_stop_throbbing(struct toolbar *toolbar) { if (toolbar != NULL && toolbar->throbber != NULL) @@ -1547,7 +1548,16 @@ void ro_toolbar_stop_throbbing(struct toolbar *toolbar) /* This is an exported interface documented in toolbar.h */ +void ro_toolbar_page_info_change(struct toolbar *toolbar) +{ + if (toolbar == NULL || toolbar->url == NULL) + return; + + ro_gui_url_bar_page_info_change(toolbar->url); +} + +/* This is an exported interface documented in toolbar.h */ void ro_toolbar_throb(struct toolbar *toolbar) { if (toolbar != NULL && toolbar->throbber != NULL) @@ -1656,7 +1666,6 @@ bool ro_toolbar_get_url_field_extent(struct toolbar *toolbar, os_box *extent) /* This is an exported interface documented in toolbar.h */ - void ro_toolbar_set_site_favicon(struct toolbar *toolbar, struct hlcache_handle *h) { @@ -1668,7 +1677,6 @@ void ro_toolbar_set_site_favicon(struct toolbar *toolbar, /* This is an exported interface documented in toolbar.h */ - void ro_toolbar_set_content_favicon(struct toolbar *toolbar, struct gui_window *g) { |