mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Attempt to fix a couple of Enforcer hits" 

This reverts commit 2893e30c4e.

This commit somehow was reverting some things which shouldn't have been reverted.

Conflicts:
	amiga/gui.c
This commit is contained in:
Chris Young 2015-01-31 11:59:31 +00:00
parent a54170eeea
commit 9de4889a4f
2 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
amiga/filetype.c
View File

@ -297,7 +297,6 @@ static struct ami_mime_entry *ami_mime_entry_locate(lwc_string *search,
{
nnode=(struct nsObject *)GetSucc((struct Node *)node);
mimeentry = node->objstruct;
if(mimeentry == NULL) continue;
lerror = lwc_error_ok;

50
amiga/gui.c
View File

@ -1535,7 +1535,8 @@ static bool ami_gui_hscroll_add(struct gui_window_2 *gwin)
IDoMethod(gwin->objects[GID_HSCROLLLAYOUT], LM_ADDCHILD,
gwin->win, gwin->objects[GID_HSCROLL], attrs);
#else
SetAttrs(gwin->objects[GID_HSCROLLLAYOUT], LAYOUT_AddChild, gwin->objects[GID_HSCROLL]);
SetAttrs(gwin->objects[GID_HSCROLLLAYOUT],
LAYOUT_AddChild, gwin->objects[GID_HSCROLL], TAG_MORE, &attrs);
#endif
return true;
}
@ -1579,7 +1580,8 @@ static bool ami_gui_vscroll_add(struct gui_window_2 *gwin)
IDoMethod(gwin->objects[GID_VSCROLLLAYOUT], LM_ADDCHILD,
gwin->win, gwin->objects[GID_VSCROLL], attrs);
#else
SetAttrs(gwin->objects[GID_VSCROLLLAYOUT], LAYOUT_AddChild, gwin->objects[GID_VSCROLL]);
SetAttrs(gwin->objects[GID_VSCROLLLAYOUT],
LAYOUT_AddChild, gwin->objects[GID_VSCROLL], TAG_MORE, &attrs);
#endif
return true;
}
@ -1857,6 +1859,7 @@ static void ami_handle_msg(void)
while((result = RA_HandleInput(gwin->objects[OID_MAIN], &code)) != WMHI_LASTMSG) {
LOG(("%d: %d (switch)",code, result & WMHI_CLASSMASK));
switch(result & WMHI_CLASSMASK) // class
{
case WMHI_MOUSEMOVE:
@ -3180,13 +3183,20 @@ static void ami_gui_hotlist_toolbar_add(struct gui_window_2 *gwin)
BevelObj,
BEVEL_Style, BVS_SBAR_VERT,
BevelEnd;
#ifdef __amigaos4__
IDoMethod(gwin->objects[GID_HOTLISTLAYOUT], LM_ADDCHILD,
gwin->win, gwin->objects[GID_HOTLIST], attrs);
IDoMethod(gwin->objects[GID_HOTLISTLAYOUT], LM_ADDIMAGE,
gwin->win, gwin->objects[GID_HOTLISTSEPBAR], NULL);
#else
SetAttrs(gwin->objects[GID_HOTLISTLAYOUT],
LAYOUT_AddChild, gwin->objects[GID_HOTLIST], TAG_MORE, &attrs);
SetAttrs(gwin->objects[GID_HOTLISTLAYOUT],
LAYOUT_AddChild, gwin->objects[GID_HOTLISTSEPBAR], TAG_DONE);
#endif
FlushLayoutDomainCache((struct Gadget *)gwin->objects[GID_MAIN]);
RethinkLayout((struct Gadget *)gwin->objects[GID_MAIN],
@ -3232,14 +3242,16 @@ static void ami_gui_hotlist_toolbar_remove(struct gui_window_2 *gwin)
IDoMethod(gwin->objects[GID_HOTLISTLAYOUT], LM_REMOVECHILD,
gwin->win, gwin->objects[GID_HOTLISTSEPBAR]);
#else
SetAttrs(gwin->objects[GID_HOTLISTLAYOUT], LAYOUT_RemoveChild, gwin->objects[GID_HOTLIST]);
SetAttrs(gwin->objects[GID_HOTLISTLAYOUT], LAYOUT_RemoveChild, gwin->objects[GID_HOTLISTSEPBAR]);
#endif
FlushLayoutDomainCache((struct Gadget *)gwin->objects[GID_MAIN]);
RethinkLayout((struct Gadget *)gwin->objects[GID_MAIN],
gwin->win, NULL, TRUE);
ami_schedule_redraw(gwin, true);
#endif
}
static void ami_gui_hotlist_toolbar_update(struct gui_window_2 *gwin)
@ -3296,9 +3308,7 @@ static void ami_toggletabbar(struct gui_window_2 *gwin, bool show)
{
if(ClickTabBase->lib_Version < 53) return;
#ifdef __amigaos4__
if(show)
{
if(show) {
struct TagItem attrs[3];
attrs[0].ti_Tag = CHILD_WeightedWidth;
@ -3325,20 +3335,31 @@ static void ami_toggletabbar(struct gui_window_2 *gwin, bool show)
GA_Text, "+",
BUTTON_RenderImage, gwin->objects[GID_ADDTAB_BM],
ButtonEnd;
#ifdef __amigaos4__
IDoMethod(gwin->objects[GID_TABLAYOUT], LM_ADDCHILD,
gwin->win, gwin->objects[GID_TABS], NULL);
IDoMethod(gwin->objects[GID_TABLAYOUT], LM_ADDCHILD,
gwin->win, gwin->objects[GID_ADDTAB], attrs);
}
else
{
#else
SetAttrs(gwin->objects[GID_TABLAYOUT],
LAYOUT_AddChild, gwin->objects[GID_TABS], TAG_DONE);
SetAttrs(gwin->objects[GID_TABLAYOUT],
LAYOUT_AddChild, gwin->objects[GID_ADDTAB], TAG_MORE, &attrs);
#endif
} else {
#ifdef __amigaos4__
IDoMethod(gwin->objects[GID_TABLAYOUT], LM_REMOVECHILD,
gwin->win, gwin->objects[GID_TABS]);
IDoMethod(gwin->objects[GID_TABLAYOUT], LM_REMOVECHILD,
gwin->win, gwin->objects[GID_ADDTAB]);
#else
SetAttrs(gwin->objects[GID_TABLAYOUT],
LAYOUT_RemoveChild, gwin->objects[GID_TABS], TAG_DONE);
SetAttrs(gwin->objects[GID_TABLAYOUT],
LAYOUT_RemoveChild, gwin->objects[GID_ADDTAB], TAG_DONE);
#endif
gwin->objects[GID_TABS] = NULL;
gwin->objects[GID_ADDTAB] = NULL;
@ -3350,7 +3371,6 @@ static void ami_toggletabbar(struct gui_window_2 *gwin, bool show)
gwin->win, NULL, TRUE);
if(gwin->gw && gwin->gw->bw) browser_window_update(gwin->gw->bw, false);
#endif
}
void ami_gui_tabs_toggle_all(void)
@ -4928,6 +4948,8 @@ static nserror gui_search_web_provider_update(const char *provider_name,
bm = ami_bitmap_get_native(ico_bitmap, 16, 16, NULL);
}
if(bm == NULL) return NSERROR_BAD_PARAMETER;
node = (struct nsObject *)GetHead((struct List *)window_list);
do {
@ -5223,7 +5245,7 @@ Object *ami_gui_splash_open(void)
SetRPAttrs(win->RPort, RPTAG_APenColor, 0xFF3F6DFE, TAG_DONE);
tattr.ta_Name = "DejaVu Serif Italic.font";
#else
SetAPen(win->RPort, 3);
SetAPen(win->RPort, 3); /* Pen 3 is usually blue */
tattr.ta_Name = "CGTriumvirate.font";
#endif
tattr.ta_YSize = 24;