r9592 chris_y - /trunk/netsurf/amiga/gui.c

[netsurf at semichrome.net]

Author: chris_y
Date: Thu Sep 17 16:44:07 2009
New Revision: 9592

URL: http://source.netsurf-browser.org?rev=9592&view=rev
Log:
Fix obviously wrong logic and tweak the status display area frame slightly so it looks
better (or at least fits in with the OS look better)

Modified:
    trunk/netsurf/amiga/gui.c

Modified: trunk/netsurf/amiga/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=9592&r1=9591&r2=9592&view=diff
==============================================================================
--- trunk/netsurf/amiga/gui.c (original)
+++ trunk/netsurf/amiga/gui.c Thu Sep 17 16:44:07 2009
@@ -2177,10 +2177,9 @@
 					NULL,
 					"frameiclass",
 					IA_FrameType, FRAME_DISPLAY,
-					IA_Simple, TRUE,
-					IA_Top, -(scrn->RastPort.TxHeight),
+					IA_Top, 1-(scrn->RastPort.TxHeight),
 					IA_Left, -1,
-					IA_Height, 1 + scrn->WBorBottom + scrn->RastPort.TxHeight,
+					IA_Height, scrn->WBorBottom + scrn->RastPort.TxHeight,
 					IA_InBorder, TRUE,
 					TAG_DONE),
 				GA_Next, gwin->shared->gadgets[GID_HSCROLL],
@@ -2371,33 +2370,34 @@
 	if(!g) return;
 	if(!title) return;
 
+	utf8title = ami_utf8_easy((char *)title);
+
 	if(g->tab_node)
 	{
-		utf8title = ami_utf8_easy((char *)title);
-
+		node = g->tab_node;
+
+		SetGadgetAttrs(g->shared->gadgets[GID_TABS],g->shared->win,NULL,
+						CLICKTAB_Labels,~0,
+						TAG_DONE);
+
+		SetClickTabNodeAttrs(node, TNA_Text, utf8title, TAG_DONE);
+		RefreshSetGadgetAttrs(g->shared->gadgets[GID_TABS], g->shared->win, NULL,
+							CLICKTAB_Labels, &g->shared->tab_list,
+							TAG_DONE);
+
+		if(ClickTabBase->lib_Version < 53)
+			RethinkLayout(g->shared->gadgets[GID_TABLAYOUT],g->shared->win,NULL,TRUE);
+	}
+
+	GetAttr(CLICKTAB_Current,g->shared->gadgets[GID_TABS],(ULONG *)&cur_tab);
+
+	if((cur_tab == g->tab) || (g->shared->tabs == 0))
+	{
 		if((g->shared->wintitle == NULL) || (strcmp(utf8title, g->shared->wintitle)))
 		{
-			node = g->tab_node;
-
-			SetGadgetAttrs(g->shared->gadgets[GID_TABS],g->shared->win,NULL,
-							CLICKTAB_Labels,~0,
-							TAG_DONE);
 			if(g->shared->wintitle) ami_utf8_free(g->shared->wintitle);
 			g->shared->wintitle = utf8title;
-			SetClickTabNodeAttrs(node,TNA_Text, g->shared->wintitle, TAG_DONE);
-			RefreshSetGadgetAttrs(g->shared->gadgets[GID_TABS],g->shared->win,NULL,
-							CLICKTAB_Labels,&g->shared->tab_list,
-							TAG_DONE);
-
-			if(ClickTabBase->lib_Version < 53)
-				RethinkLayout(g->shared->gadgets[GID_TABLAYOUT],g->shared->win,NULL,TRUE);
-
-			GetAttr(CLICKTAB_Current,g->shared->gadgets[GID_TABS],(ULONG *)&cur_tab);
-
-			if((cur_tab == g->tab) || (g->shared->tabs == 0))
-			{
-				SetWindowTitles(g->shared->win, g->shared->wintitle, nsscreentitle);
-			}
+			SetWindowTitles(g->shared->win, g->shared->wintitle, nsscreentitle);
 		}
 	}
 }