diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2009-04-01 17:26:39 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2009-04-01 17:26:39 +0000 |
commit | b10db01386c9cc661cbd276d3ee7230d822f7d40 (patch) | |
tree | 19835c29b8dcea83c8b1750e8c0174f8300dabbf | |
parent | 06acdd6c69a9fa5c57324ffe5dd3978179efa404 (diff) | |
download | netsurf-b10db01386c9cc661cbd276d3ee7230d822f7d40.tar.gz netsurf-b10db01386c9cc661cbd276d3ee7230d822f7d40.tar.bz2 |
Don't open menu if there are no items
svn path=/trunk/netsurf/; revision=7019
-rwxr-xr-x | amiga/context_menu.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/amiga/context_menu.c b/amiga/context_menu.c index f97b6aa60..453c8d62d 100755 --- a/amiga/context_menu.c +++ b/amiga/context_menu.c @@ -72,6 +72,7 @@ void ami_context_menu_show(struct gui_window_2 *gwin,int x,int y) struct content *cc = gwin->bw->current_content; int box_x=0; int box_y=0; + bool menuhascontent = false; if(cc->type != CONTENT_HTML) return; @@ -117,6 +118,8 @@ void ami_context_menu_show(struct gui_window_2 *gwin,int x,int y) TAG_DONE), TAG_DONE), ~0); + + menuhascontent = true; } if (curbox->object) @@ -143,6 +146,8 @@ void ami_context_menu_show(struct gui_window_2 *gwin,int x,int y) TAG_DONE), TAG_DONE), ~0); + + menuhascontent = true; } if(curbox->text) @@ -164,6 +169,8 @@ void ami_context_menu_show(struct gui_window_2 *gwin,int x,int y) TAG_DONE), TAG_DONE), ~0); + + menuhascontent = true; } if (curbox->gadget) @@ -178,11 +185,15 @@ void ami_context_menu_show(struct gui_window_2 *gwin,int x,int y) PMIA_UserData,curbox, TAG_DONE), ~0); + + menuhascontent = true; break; } } } + if(!menuhascontent) return; + gui_window_set_pointer(gwin->bw->window,GUI_POINTER_DEFAULT); IDoMethod(gwin->objects[OID_MENU],PM_OPEN,gwin->win); } |