mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-16 09:12:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Change clicktab userdata to hold gui_window instead of browser_window

Browse Source
This commit is contained in:
Chris Young 2014-11-16 14:24:18 +00:00
parent 1d50a2ff8a
commit e3620ac675
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
amiga/gui.c
View File

@ -1997,16 +1997,15 @@ static void ami_handle_msg(void)
if(gwin->objects[GID_TABS] == NULL) break; if(gwin->objects[GID_TABS] == NULL) break;
GetAttrs(gwin->objects[GID_TABS], GetAttrs(gwin->objects[GID_TABS],
CLICKTAB_NodeClosed, &tabnode, TAG_DONE); CLICKTAB_NodeClosed, &tabnode, TAG_DONE);
if(tabnode) if(tabnode) {
{ struct gui_window *closedgw;
GetClickTabNodeAttrs(tabnode, GetClickTabNodeAttrs(tabnode,
TNA_UserData, &closedbw, TNA_UserData, &closedgw,
TAG_DONE); TAG_DONE);
browser_window_destroy(closedbw); browser_window_destroy(closedgw->bw);
} } else {
else
{
ami_switch_tab(gwin, true); ami_switch_tab(gwin, true);
} }
break; break;
@ -2376,7 +2375,7 @@ static void ami_handle_msg(void)
switch(node->Type) switch(node->Type)
{ {
struct Node *tab = NULL, *ntab = NULL; struct Node *tab = NULL, *ntab = NULL;
struct browser_window *bw = NULL; struct gui_window *gw = NULL;
case AMINS_WINDOW: case AMINS_WINDOW:
ami_set_border_gadget_size(gwin); ami_set_border_gadget_size(gwin);
@ -2390,7 +2389,7 @@ static void ami_handle_msg(void)
{ {
ntab=GetSucc(tab); ntab=GetSucc(tab);
GetClickTabNodeAttrs(tab, GetClickTabNodeAttrs(tab,
TNA_UserData, &bw, TNA_UserData, &gw,
TAG_DONE); TAG_DONE);
} while((tab=ntab)); } while((tab=ntab));
} }
@ -2806,9 +2805,9 @@ void ami_switch_tab(struct gui_window_2 *gwin,bool redraw)
GetAttr(CLICKTAB_CurrentNode, (Object *)gwin->objects[GID_TABS], GetAttr(CLICKTAB_CurrentNode, (Object *)gwin->objects[GID_TABS],
(ULONG *)&tabnode); (ULONG *)&tabnode);
GetClickTabNodeAttrs(tabnode, GetClickTabNodeAttrs(tabnode,
TNA_UserData, &gwin->bw, TNA_UserData, &gwin->gw,
TAG_DONE); TAG_DONE);
curbw = gwin->bw; curbw = gw->bw;
if(ami_gui_get_space_box((Object *)gwin->objects[GID_BROWSER], &bbox) != NSERROR_OK) { if(ami_gui_get_space_box((Object *)gwin->objects[GID_BROWSER], &bbox) != NSERROR_OK) {
warn_user("NoMemory", ""); warn_user("NoMemory", "");
@ -3442,6 +3441,7 @@ gui_window_create(struct browser_window *bw,
NewList(&g->dllist); NewList(&g->dllist);
g->deferred_rects = NewObjList(); g->deferred_rects = NewObjList();
g->bw = bw;
if((flags & GW_CREATE_TAB) && existing) if((flags & GW_CREATE_TAB) && existing)
{ {
@ -3460,16 +3460,13 @@ gui_window_create(struct browser_window *bw,
g->tab_node = AllocClickTabNode(TNA_Text, messages_get("NetSurf"), g->tab_node = AllocClickTabNode(TNA_Text, messages_get("NetSurf"),
TNA_Number, g->tab, TNA_Number, g->tab,
TNA_UserData,bw, TNA_UserData, g,
TNA_CloseGadget, TRUE, TNA_CloseGadget, TRUE,
TAG_DONE); TAG_DONE);
if(nsoption_bool(new_tab_last)) if(nsoption_bool(new_tab_last)) {
{
AddTail(&g->shared->tab_list, g->tab_node); AddTail(&g->shared->tab_list, g->tab_node);
} } else {
else
{
struct Node *insert_after = existing->tab_node; struct Node *insert_after = existing->tab_node;
if(existing->last_new_tab) if(existing->last_new_tab)
@ -3483,15 +3480,17 @@ gui_window_create(struct browser_window *bw,
CLICKTAB_Labels, &g->shared->tab_list, CLICKTAB_Labels, &g->shared->tab_list,
TAG_DONE); TAG_DONE);
if(nsoption_bool(new_tab_is_active)) if(nsoption_bool(new_tab_is_active)) {
{ RefreshSetGadgetAttrs((struct Gadget *)g->shared->objects[GID_TABS],
RefreshSetGadgetAttrs((struct Gadget *)g->shared->objects[GID_TABS],g->shared->win,NULL, g->shared->win, NULL,
CLICKTAB_Current, g->tab, CLICKTAB_Current, g->tab,
TAG_DONE); TAG_DONE);
} }
if(ClickTabBase->lib_Version < 53) if(ClickTabBase->lib_Version < 53) {
RethinkLayout((struct Gadget *)g->shared->objects[GID_TABLAYOUT],g->shared->win,NULL,TRUE); RethinkLayout((struct Gadget *)g->shared->objects[GID_TABLAYOUT],
g->shared->win, NULL, TRUE);
}
g->shared->next_tab++; g->shared->next_tab++;
@ -3545,7 +3544,7 @@ gui_window_create(struct browser_window *bw,
NewList(&g->shared->tab_list); NewList(&g->shared->tab_list);
g->tab_node = AllocClickTabNode(TNA_Text,messages_get("NetSurf"), g->tab_node = AllocClickTabNode(TNA_Text,messages_get("NetSurf"),
TNA_Number, 0, TNA_Number, 0,
TNA_UserData, bw, TNA_UserData, g,
TNA_CloseGadget, TRUE, TNA_CloseGadget, TRUE,
TAG_DONE); TAG_DONE);
AddTail(&g->shared->tab_list,g->tab_node); AddTail(&g->shared->tab_list,g->tab_node);
@ -3976,7 +3975,7 @@ gui_window_create(struct browser_window *bw,
} }
g->shared->rmbtrapped = FALSE; g->shared->rmbtrapped = FALSE;
g->shared->bw = bw; g->shared->gw = g;
curbw = bw; curbw = bw;
g->shared->appwin = AddAppWindowA((ULONG)g->shared->objects[OID_MAIN], g->shared->appwin = AddAppWindowA((ULONG)g->shared->objects[OID_MAIN],
@ -4017,14 +4016,14 @@ void ami_close_all_tabs(struct gui_window_2 *gwin)
{ {
ntab=GetSucc(tab); ntab=GetSucc(tab);
GetClickTabNodeAttrs(tab, GetClickTabNodeAttrs(tab,
TNA_UserData,&gwin->bw, TNA_UserData,&gwin->gw,
TAG_DONE); TAG_DONE);
browser_window_destroy(gwin->bw); browser_window_destroy(gwin->gw->bw);
} while((tab=ntab)); } while((tab=ntab));
} }
else else
{ {
browser_window_destroy(gwin->bw); browser_window_destroy(gwin->gw->bw);
} }
} }

3
amiga/gui.h
View File

@ -85,7 +85,7 @@ struct gui_window_2 {
struct nsObject *node; struct nsObject *node;
struct Window *win; struct Window *win;
Object *objects[GID_LAST]; Object *objects[GID_LAST];
struct browser_window *bw; struct gui_window *gw; /* currently-displayed gui_window */
bool redraw_required; bool redraw_required;
int throbber_frame; int throbber_frame;
struct List tab_list; struct List tab_list;
@ -151,6 +151,7 @@ struct gui_window
bool throbbing; bool throbbing;
char *tabtitle; char *tabtitle;
struct MinList *deferred_rects; struct MinList *deferred_rects;
struct browser_window *bw;
}; };
void ami_get_msg(void); void ami_get_msg(void);