From ddfdf2a629fbccc652e7c0c68f35babbec1a839f Mon Sep 17 00:00:00 2001 From: Chris Young Date: Tue, 1 Mar 2011 20:27:49 +0000 Subject: Don't trap RMB over gadgets if those gadgets are disabled svn path=/trunk/netsurf/; revision=11879 --- amiga/context_menu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'amiga') diff --git a/amiga/context_menu.c b/amiga/context_menu.c index 30d9a557c..06d9f29dd 100755 --- a/amiga/context_menu.c +++ b/amiga/context_menu.c @@ -130,11 +130,13 @@ BOOL ami_context_menu_mouse_trap(struct gui_window_2 *gwin, BOOL trap) if((option_kiosk_mode == false) && (trap == FALSE) && (gwin->bw->browser_window_type == BROWSER_WINDOW_NORMAL)) { - if(ami_gadget_hit(gwin->objects[GID_BACK], + if(browser_window_back_available(gwin->bw) && + ami_gadget_hit(gwin->objects[GID_BACK], gwin->win->MouseX, gwin->win->MouseY)) trap = TRUE; - if(ami_gadget_hit(gwin->objects[GID_FORWARD], + if(browser_window_forward_available(gwin->bw) && + ami_gadget_hit(gwin->objects[GID_FORWARD], gwin->win->MouseX, gwin->win->MouseY)) trap = TRUE; } @@ -169,7 +171,6 @@ void ami_context_menu_show(struct gui_window_2 *gwin,int x,int y) TAG_DONE); if(gwin->bw && gwin->bw->history && - browser_window_back_available(gwin->bw) && ami_gadget_hit(gwin->objects[GID_BACK], gwin->win->MouseX, gwin->win->MouseY)) { @@ -193,7 +194,6 @@ void ami_context_menu_show(struct gui_window_2 *gwin,int x,int y) menuhascontent = true; } else if(gwin->bw && gwin->bw->history && - browser_window_forward_available(gwin->bw) && ami_gadget_hit(gwin->objects[GID_FORWARD], gwin->win->MouseX, gwin->win->MouseY)) { -- cgit v1.2.3