1 files changed, 79 insertions, 22 deletions

diff --git a/src/gwin/radio.c b/src/gwin/radio.c
index f50ffe9b..8dc3ba6b 100644
--- a/src/gwin/radio.c
+++ b/src/gwin/radio.c
@@ -21,6 +21,11 @@
 
 #include "src/gwin/class_gwin.h"
 
+#define GRADIO_TAB_CNR			3		// Diagonal corner on active tab
+#define GRADIO_TOP_FADE			50		// (GRADIO_TOP_FADE/255)% fade to white for top of tab/button
+#define GRADIO_BOTTOM_FADE		25		// (GRADIO_BOTTOM_FADE/255)% fade to black for bottom of tab/button
+#define GRADIO_OUTLINE_FADE		128		// (GRADIO_OUTLINE_FADE/255)% fade to background for active tab edge
+
 // Our pressed state
 #define GRADIO_FLG_PRESSED		(GWIN_FIRST_CONTROL_FLAG<<0)
 
@@ -195,34 +200,86 @@ void gwinRadioDraw_Radio(GWidgetObject *gw, void *param) {
 	#undef gcw
 }
 
-void gwinRadioDraw_Button(GWidgetObject *gw, void *param) {
-	const GColorSet *	pcol;
-	(void)				param;
-
-	if (gw->g.vmt != (gwinVMT *)&radioVMT) return;
-	pcol = getDrawColors(gw);
-	
-	gdispGFillStringBox(gw->g.display, gw->g.x, gw->g.y, gw->g.width-1, gw->g.height-1, gw->text, gw->g.font, pcol->text, pcol->fill, justifyCenter);
-	gdispGDrawLine(gw->g.display, gw->g.x+gw->g.width-1, gw->g.y, gw->g.x+gw->g.width-1, gw->g.y+gw->g.height-1, pcol->edge);
-	gdispGDrawLine(gw->g.display, gw->g.x, gw->g.y+gw->g.height-1, gw->g.x+gw->g.width-2, gw->g.y+gw->g.height-1, pcol->edge);
-}
-
-void gwinRadioDraw_Tab(GWidgetObject *gw, void *param) {
-	const GColorSet *	pcol;
-	(void)				param;
+#if GWIN_FLAT_STYLING
+	void gwinRadioDraw_Button(GWidgetObject *gw, void *param) {
+		const GColorSet *	pcol;
+		(void)				param;
 
-	if (gw->g.vmt != (gwinVMT *)&radioVMT)	return;
-	pcol = getDrawColors(gw);
+		if (gw->g.vmt != (gwinVMT *)&radioVMT) return;
+		pcol = getDrawColors(gw);
 	
-	if ((gw->g.flags & GRADIO_FLG_PRESSED)) {
-		gdispGDrawBox(gw->g.display, gw->g.x, gw->g.y, gw->g.width, gw->g.height, pcol->edge);
-		gdispGFillStringBox(gw->g.display, gw->g.x+1, gw->g.y+1, gw->g.width-2, gw->g.height-1, gw->text, gw->g.font, pcol->text, pcol->fill, justifyCenter);
-	} else {
 		gdispGFillStringBox(gw->g.display, gw->g.x, gw->g.y, gw->g.width-1, gw->g.height-1, gw->text, gw->g.font, pcol->text, pcol->fill, justifyCenter);
 		gdispGDrawLine(gw->g.display, gw->g.x+gw->g.width-1, gw->g.y, gw->g.x+gw->g.width-1, gw->g.y+gw->g.height-1, pcol->edge);
 		gdispGDrawLine(gw->g.display, gw->g.x, gw->g.y+gw->g.height-1, gw->g.x+gw->g.width-2, gw->g.y+gw->g.height-1, pcol->edge);
 	}
-}
+	void gwinRadioDraw_Tab(GWidgetObject *gw, void *param) {
+		const GColorSet *	pcol;
+		(void)				param;
+
+		if (gw->g.vmt != (gwinVMT *)&radioVMT)	return;
+		pcol = getDrawColors(gw);
+
+		if ((gw->g.flags & GRADIO_FLG_PRESSED)) {
+			gdispGDrawBox(gw->g.display, gw->g.x, gw->g.y, gw->g.width, gw->g.height, pcol->edge);
+			gdispGFillStringBox(gw->g.display, gw->g.x+1, gw->g.y+1, gw->g.width-2, gw->g.height-1, gw->text, gw->g.font, pcol->text, pcol->fill, justifyCenter);
+		} else {
+			gdispGFillStringBox(gw->g.display, gw->g.x, gw->g.y, gw->g.width-1, gw->g.height-1, gw->text, gw->g.font, pcol->text, pcol->fill, justifyCenter);
+			gdispGDrawLine(gw->g.display, gw->g.x+gw->g.width-1, gw->g.y, gw->g.x+gw->g.width-1, gw->g.y+gw->g.height-1, pcol->edge);
+			gdispGDrawLine(gw->g.display, gw->g.x, gw->g.y+gw->g.height-1, gw->g.x+gw->g.width-2, gw->g.y+gw->g.height-1, pcol->edge);
+		}
+	}
+#else
+	void gwinRadioDraw_Button(GWidgetObject *gw, void *param) {
+		const GColorSet *	pcol;
+		fixed				alpha;
+		fixed				dalpha;
+		coord_t				i;
+		color_t				tcol, bcol;
+		(void)				param;
+
+		if (gw->g.vmt != (gwinVMT *)&radioVMT) return;
+		pcol = getDrawColors(gw);
+	
+		/* Fill the box blended from variants of the fill color */
+		tcol = gdispBlendColor(White, pcol->fill, GRADIO_TOP_FADE);
+		bcol = gdispBlendColor(Black, pcol->fill, GRADIO_BOTTOM_FADE);
+		dalpha = FIXED(255)/gw->g.height;
+		for(alpha = 0, i = 0; i < gw->g.height; i++, alpha += dalpha)
+			gdispGDrawLine(gw->g.display, gw->g.x, gw->g.y+i, gw->g.x+gw->g.width-2, gw->g.y+i, gdispBlendColor(bcol, tcol, NONFIXED(alpha)));
+
+		gdispGDrawStringBox(gw->g.display, gw->g.x, gw->g.y, gw->g.width-1, gw->g.height-1, gw->text, gw->g.font, pcol->text, justifyCenter);
+		gdispGDrawLine(gw->g.display, gw->g.x+gw->g.width-1, gw->g.y, gw->g.x+gw->g.width-1, gw->g.y+gw->g.height-1, pcol->edge);
+		gdispGDrawLine(gw->g.display, gw->g.x, gw->g.y+gw->g.height-1, gw->g.x+gw->g.width-2, gw->g.y+gw->g.height-1, pcol->edge);
+	}
+	void gwinRadioDraw_Tab(GWidgetObject *gw, void *param) {
+		const GColorSet *	pcol;
+		fixed				alpha;
+		fixed				dalpha;
+		coord_t				i;
+		color_t				tcol, bcol;
+		(void)				param;
+
+		if (gw->g.vmt != (gwinVMT *)&radioVMT)	return;
+		pcol = getDrawColors(gw);
+
+		if ((gw->g.flags & GRADIO_FLG_PRESSED)) {
+			tcol = gdispBlendColor(pcol->edge, gw->pstyle->background, GRADIO_OUTLINE_FADE);
+			gdispGFillStringBox(gw->g.display, gw->g.x, gw->g.y, gw->g.width, gw->g.height, gw->text, gw->g.font, pcol->text, gw->g.bgcolor, justifyCenter);
+			gdispGDrawLine(gw->g.display, gw->g.x, gw->g.y, gw->g.x+gw->g.width-(GRADIO_TAB_CNR+1), gw->g.y, tcol);
+			gdispGDrawLine(gw->g.display, gw->g.x+gw->g.width-(GRADIO_TAB_CNR+1), gw->g.y, gw->g.x+gw->g.width-1, gw->g.y+GRADIO_TAB_CNR, tcol);
+			gdispGDrawLine(gw->g.display, gw->g.x+gw->g.width-1, gw->g.y+GRADIO_TAB_CNR, gw->g.x+gw->g.width-1, gw->g.y+gw->g.height-1, tcol);
+		} else {
+			/* Fill the box blended from variants of the fill color */
+			tcol = gdispBlendColor(White, pcol->fill, GRADIO_TOP_FADE);
+			bcol = gdispBlendColor(Black, pcol->fill, GRADIO_BOTTOM_FADE);
+			dalpha = FIXED(255)/gw->g.height;
+			for(alpha = 0, i = 0; i < gw->g.height; i++, alpha += dalpha)
+				gdispGDrawLine(gw->g.display, gw->g.x, gw->g.y+i, gw->g.x+gw->g.width-2, gw->g.y+i, gdispBlendColor(bcol, tcol, NONFIXED(alpha)));
+			gdispGDrawLine(gw->g.display, gw->g.x+gw->g.width-1, gw->g.y, gw->g.x+gw->g.width-1, gw->g.y+gw->g.height-1, pcol->edge);
+			gdispGDrawStringBox(gw->g.display, gw->g.x+1, gw->g.y+1, gw->g.width-2, gw->g.height-2, gw->text, gw->g.font, pcol->text, justifyCenter);
+		}
+	}
+#endif
 
 #endif /* GFX_USE_GWIN && GWIN_NEED_BUTTON */
 /** @} */