X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin2_src%2FWM%2Fdecorator.c;h=9eb6a62f5fabf71637a90abb03d46db3374e731d;hb=9f9866b03ac7d352fceeb0b03f3e7ef90f1d723d;hp=601f9535cb2a05c01e228fcf3f18623d66cf5d70;hpb=099719a211c90b88e59e9dc08bcf18ec1a21573d;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin2_src/WM/decorator.c b/Usermode/Applications/axwin2_src/WM/decorator.c
index 601f9535..9eb6a62f 100644
--- a/Usermode/Applications/axwin2_src/WM/decorator.c
+++ b/Usermode/Applications/axwin2_src/WM/decorator.c
@@ -7,6 +7,8 @@
 #include "common.h"
 #include "wm.h"
 
+#define BORDER_EVERYTHING	1
+
 #define BOX_BGCOLOUR    0xC0C0C0
 #define BOX_BORDER      0xA0A0A0
 #define BUTTON_BGCOLOUR 0xD0D0D0
@@ -22,6 +24,13 @@ void Decorator_RenderWidget(tElement *Element)
 		Element->CachedW, Element->CachedH
 		);
 	
+	#if BORDER_EVERYTHING
+	Video_DrawRect(Element->CachedX, Element->CachedY,
+			Element->CachedW, Element->CachedH,
+			0
+			);
+	#endif
+	
 	switch(Element->Type)
 	{
 	case ELETYPE_NONE:
@@ -67,10 +76,17 @@ void Decorator_RenderWidget(tElement *Element)
 			Element->CachedX+1, Element->CachedY+1,
 			Element->CachedW-2, Element->CachedH-2,
 			NULL,
-			10,
 			TEXT_COLOUR,
 			Element->Text
 			);
 		break;
+	
+	case ELETYPE_IMAGE:
+		Video_DrawImage(
+			Element->CachedX, Element->CachedY,
+			Element->CachedW, Element->CachedH,
+			Element->Data
+			);
+		break;
 	}
 }