Widget: Drawing optional frames

2 files changed, 15 insertions, 2 deletions

diff --git a/src/ui/widget.c b/src/ui/widget.c
index 69509e33..e83532d4 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -45,6 +45,7 @@ void init_Widget(iWidget *d) {
     d->flags          = 0;
     d->rect           = zero_Rect();
     d->bgColor        = none_ColorId;
+    d->frameColor     = none_ColorId;
     d->children       = NULL;
     d->parent         = NULL;
     d->commandHandler = NULL;
@@ -114,6 +115,10 @@ void setBackgroundColor_Widget(iWidget *d, int bgColor) {
     d->bgColor = bgColor;
 }
 
+void setFrameColor_Widget(iWidget *d, int frameColor) {
+    d->frameColor = frameColor;
+}
+
 void setCommandHandler_Widget(iWidget *d, iBool (*handler)(iWidget *, const char *)) {
     d->commandHandler = handler;
 }
@@ -392,10 +397,16 @@ iBool processEvent_Widget(iWidget *d, const SDL_Event *ev) {
 
 void draw_Widget(const iWidget *d) {
     if (d->flags & hidden_WidgetFlag) return;
-    if (d->bgColor >= 0) {
+    if (d->bgColor >= 0 || d->frameColor >= 0) {
+        const iRect rect = bounds_Widget(d);
         iPaint p;
         init_Paint(&p);
-        fillRect_Paint(&p, bounds_Widget(d), d->bgColor);
+        if (d->bgColor >= 0) {
+            fillRect_Paint(&p, rect, d->bgColor);
+        }
+        if (d->frameColor >= 0) {
+            drawRect_Paint(&p, rect, d->frameColor);
+        }
     }
     iConstForEach(ObjectList, i, d->children) {
         const iWidget *child = constAs_Widget(i.object);
diff --git a/src/ui/widget.h b/src/ui/widget.h
index af3934e6..3155d6df 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -65,6 +65,7 @@ struct Impl_Widget {
     int          flags;
     iRect        rect;
     int          bgColor;
+    int          frameColor;
     iObjectList *children;
     iWidget *    parent;
     iBool (*commandHandler)(iWidget *, const char *);
@@ -113,6 +114,7 @@ void    setFlags_Widget     (iWidget *, int flags, iBool set);
 void    setPos_Widget       (iWidget *, iInt2 pos);
 void    setSize_Widget      (iWidget *, iInt2 size);
 void    setBackgroundColor_Widget   (iWidget *, int bgColor);
+void    setFrameColor_Widget        (iWidget *, int frameColor);
 void    setCommandHandler_Widget    (iWidget *, iBool (*handler)(iWidget *, const char *));
 iAny *  addChild_Widget     (iWidget *, iAnyObject *child); /* holds a ref */
 iAny *  addChildPos_Widget  (iWidget *, iAnyObject *child, enum iWidgetAddPos addPos);