Fixed drawing of widget frames

In CertImportWidget at regular-DPI 1.0 scaling, the frames of the certificate and private key labels were drawn incorrectly.

Now the non-button LabelWidget relies on Widget to draw the frames.

2 files changed, 3 insertions, 5 deletions

diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index bd8b71da..57136509 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -128,7 +128,7 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
     /* Default color state. */
     *bg     = isButton ? uiBackground_ColorId : none_ColorId;
     *fg     = uiText_ColorId;
-    *frame1 = isButton ? uiEmboss1_ColorId : uiFrame_ColorId;
+    *frame1 = isButton ? uiEmboss1_ColorId : d->widget.frameColor;
     *frame2 = isButton ? uiEmboss2_ColorId : *frame1;
     if (flags_Widget(w) & disabled_WidgetFlag && isButton) {
         *fg = uiTextDisabled_ColorId;
@@ -207,9 +207,6 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
             drawLines_Paint(&p, points + 2, 3, frame2);
             drawLines_Paint(&p, points, 3, frame);
         }
-        else {
-            drawRect_Paint(&p, frameRect, frame);
-        }
     }
     setClip_Paint(&p, rect);
     if (flags & wrapText_WidgetFlag) {
@@ -285,6 +282,7 @@ void init_LabelWidget(iLabelWidget *d, const char *label, const char *cmd) {
         initCStr_String(&d->command, cmd);
     }
     else {
+        setFrameColor_Widget(&d->widget, uiFrame_ColorId);
         init_String(&d->command);
     }
     d->key   = 0;
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 1d2aecf0..e2d0f922 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -637,7 +637,7 @@ void drawBackground_Widget(const iWidget *d) {
         if (d->bgColor >= 0) {
             fillRect_Paint(&p, rect, d->bgColor);
         }
-        if (d->frameColor >= 0) {
+        if (d->frameColor >= 0 && ~d->flags & frameless_WidgetFlag) {
             drawRectThickness_Paint(&p, rect, gap_UI / 4, d->frameColor);
         }
     }