X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin2_src%2FWM%2Fdecorator.c;h=171b526148f682e1854da0fadeadab275fdb1fac;hb=e02f66c7125bf18f77c6c53587238cbd49da2c89;hp=9eb6a62f5fabf71637a90abb03d46db3374e731d;hpb=c3a2920bab79e0a41b45c74b883367437ab1dd6d;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin2_src/WM/decorator.c b/Usermode/Applications/axwin2_src/WM/decorator.c
index 9eb6a62f..171b5261 100644
--- a/Usermode/Applications/axwin2_src/WM/decorator.c
+++ b/Usermode/Applications/axwin2_src/WM/decorator.c
@@ -34,10 +34,22 @@ void Decorator_RenderWidget(tElement *Element)
 	switch(Element->Type)
 	{
 	case ELETYPE_NONE:
-	case ELETYPE_BOX:	break;
+	case ELETYPE_BOX:	break;	// Box is a meta-element
 	
-	case ELETYPE_TABBAR:	// TODO: Moar
-	case ELETYPE_TOOLBAR:
+	case ELETYPE_TABBAR:	// Tab Bar
+		Video_DrawRect(
+			Element->CachedX, Element->CachedY,
+			Element->CachedW, Element->CachedH,
+			BOX_BORDER
+			);
+		Video_FillRect(
+			Element->CachedX+1, Element->CachedY+1,
+			Element->CachedW-2, Element->CachedH-2,
+			BOX_BGCOLOUR
+			);
+		// Enumerate Items.
+		break;
+	case ELETYPE_TOOLBAR:	// Tool Bar
 		Video_DrawRect(
 			Element->CachedX, Element->CachedY,
 			Element->CachedW, Element->CachedH,
@@ -50,7 +62,7 @@ void Decorator_RenderWidget(tElement *Element)
 			);
 		break;
 	
-	case ELETYPE_SPACER:
+	case ELETYPE_SPACER:	// Spacer (subtle line)
 		Video_FillRect(
 			Element->CachedX+3, Element->CachedY+3,
 			Element->CachedW-6, Element->CachedH-6,
@@ -58,11 +70,11 @@ void Decorator_RenderWidget(tElement *Element)
 			);
 		break;
 	
-	case ELETYPE_BUTTON:
+	case ELETYPE_BUTTON:	// Button
 		Video_FillRect(
 			Element->CachedX+1, Element->CachedY+1,
 			Element->CachedW-2, Element->CachedH-2,
-			BUTTON_BORDER
+			BUTTON_BGCOLOUR
 			);
 		Video_DrawRect(
 			Element->CachedX, Element->CachedY,
@@ -88,5 +100,9 @@ void Decorator_RenderWidget(tElement *Element)
 			Element->Data
 			);
 		break;
+		
+	default:
+		_SysDebug(" ERROR: Unknown type %i", Element->Type);
+		break;
 	}
 }