Fixed visual artifact during sidebar animation

The sidebars are not supposed to have borders or background fades.

6 files changed, 32 insertions, 14 deletions

diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 46ef5d1f..b68ab793 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -46,6 +46,7 @@ struct Impl_LabelWidget {
         uint8_t noAutoMinHeight : 1; /* minimum height is not set automatically */
         uint8_t drawAsOutline   : 1; /* draw as outline, filled with background color */
         uint8_t noTopFrame      : 1;
+        uint8_t wrap            : 1;
     } flags;
 };
 
@@ -317,7 +318,7 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
             cstr_String(&str));
         deinit_String(&str);
     }
-    if (flags & wrapText_WidgetFlag) {
+    if (d->flags.wrap) {
         const iRect inner = adjusted_Rect(innerBounds_Widget(w), init_I2(iconPad, 0), zero_I2());
         const int   wrap  = inner.size.x;
         drawWrapRange_Text(d->font, topLeft_Rect(inner), wrap, fg, range_String(&d->label));
@@ -372,7 +373,7 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
 
 static void sizeChanged_LabelWidget_(iLabelWidget *d) {
     iWidget *w = as_Widget(d);
-    if (flags_Widget(w) & wrapText_WidgetFlag) {
+    if (d->flags.wrap) {
         if (flags_Widget(w) & fixedHeight_WidgetFlag) {
             /* Calculate a new height based on the wrapping. */
             w->rect.size.y = advanceWrapRange_Text(
@@ -410,7 +411,7 @@ void updateSize_LabelWidget(iLabelWidget *d) {
         w->minSize.y = size.y; /* vertically text must remain visible */
     }
     /* Wrapped text implies that width must be defined by arrangement. */
-    if (!(flags & (fixedWidth_WidgetFlag | wrapText_WidgetFlag))) {
+    if (~flags & fixedWidth_WidgetFlag && !d->flags.wrap) {
         w->rect.size.x = size.x;
     }
     if (~flags & fixedHeight_WidgetFlag) {
@@ -442,10 +443,11 @@ void init_LabelWidget(iLabelWidget *d, const char *label, const char *cmd) {
     d->kmods = 0;
     init_Click(&d->click, d, !isEmpty_String(&d->command) ? SDL_BUTTON_LEFT : 0);
     setFlags_Widget(w, hover_WidgetFlag, d->click.button != 0);
-    d->flags.alignVisual = iFalse;
+    d->flags.alignVisual     = iFalse;
     d->flags.noAutoMinHeight = iFalse;
-    d->flags.drawAsOutline = iFalse;
-    d->flags.noTopFrame = iFalse;
+    d->flags.drawAsOutline   = iFalse;
+    d->flags.noTopFrame      = iFalse;
+    d->flags.wrap            = iFalse;
     updateSize_LabelWidget(d);
     updateKey_LabelWidget_(d); /* could be bound to another key */
 }
@@ -489,8 +491,14 @@ void setNoTopFrame_LabelWidget(iLabelWidget *d, iBool noTopFrame) {
     d->flags.noTopFrame = noTopFrame;
 }
 
+void setWrap_LabelWidget(iLabelWidget *d, iBool wrap) {
+    d->flags.wrap = wrap;
+}
+
 void setOutline_LabelWidget(iLabelWidget *d, iBool drawAsOutline) {
-    d->flags.drawAsOutline = drawAsOutline;
+    if (d) {
+        d->flags.drawAsOutline = drawAsOutline;
+    }
 }
 
 void updateText_LabelWidget(iLabelWidget *d, const iString *text) {
@@ -554,6 +562,10 @@ iChar icon_LabelWidget(const iLabelWidget *d) {
     return d->icon;
 }
 
+iBool isWrapped_LabelWidget(const iLabelWidget *d) {
+    return d->flags.wrap;
+}
+
 const iString *text_LabelWidget(const iLabelWidget *d) {
     if (!d) return collectNew_String();
     return &d->label;
diff --git a/src/ui/labelwidget.h b/src/ui/labelwidget.h
index f6343273..b8b6fd87 100644
--- a/src/ui/labelwidget.h
+++ b/src/ui/labelwidget.h
@@ -32,6 +32,7 @@ iDeclareObjectConstructionArgs(LabelWidget, const char *label, const char *comma
 void    setAlignVisually_LabelWidget(iLabelWidget *, iBool alignVisual);
 void    setNoAutoMinHeight_LabelWidget(iLabelWidget *, iBool noAutoMinHeight);
 void    setNoTopFrame_LabelWidget   (iLabelWidget *, iBool noTopFrame);
+void    setWrap_LabelWidget         (iLabelWidget *, iBool wrap);
 void    setOutline_LabelWidget      (iLabelWidget *, iBool drawAsOutline);
 void    setFont_LabelWidget         (iLabelWidget *, int fontId);
 void    setTextColor_LabelWidget    (iLabelWidget *, int color);
@@ -53,6 +54,7 @@ const iString * text_LabelWidget        (const iLabelWidget *);
 const iString * sourceText_LabelWidget  (const iLabelWidget *); /* untranslated */
 const iString * command_LabelWidget     (const iLabelWidget *);
 iChar           icon_LabelWidget        (const iLabelWidget *);
+iBool           isWrapped_LabelWidget   (const iLabelWidget *);
 
 iLabelWidget *newKeyMods_LabelWidget(const char *label, int key, int kmods, const char *command);
 iLabelWidget *newColor_LabelWidget  (const char *text, int color);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index b4948821..c0a22e99 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -523,15 +523,17 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
             addChild_Widget(div, iClob(makePadding_Widget(gap_UI)));
             addChild_Widget(div, iClob(new_LabelWidget("${menu.identity.import}", "ident.import")));
             addChildFlags_Widget(div, iClob(new_Widget()), expand_WidgetFlag); /* pad */
+            iLabelWidget *linkLabel;
             setBackgroundColor_Widget(
                 addChildFlags_Widget(
                     div,
-                    iClob(new_LabelWidget(format_CStr(cstr_Lang("ident.gotohelp"),
+                    iClob(linkLabel = new_LabelWidget(format_CStr(cstr_Lang("ident.gotohelp"),
                                                       uiTextStrong_ColorEscape,
                                                       restore_ColorEscape),
                                           "!open newtab:1 gotoheading:1.6 url:about:help")),
-                    frameless_WidgetFlag | fixedHeight_WidgetFlag | wrapText_WidgetFlag),
+                    frameless_WidgetFlag | fixedHeight_WidgetFlag),
                 uiBackgroundSidebar_ColorId);
+            setWrap_LabelWidget(linkLabel, iTrue);
             addChild_Widget(d->blank, iClob(div));
         }
 //        arrange_Widget(d->blank);
@@ -631,7 +633,8 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
     setBackgroundColor_Widget(w, none_ColorId);
     setFlags_Widget(w,
                     collapse_WidgetFlag | hidden_WidgetFlag | arrangeHorizontal_WidgetFlag |
-                        resizeWidthOfChildren_WidgetFlag,
+                        resizeWidthOfChildren_WidgetFlag | noFadeBackground_WidgetFlag |
+                    noShadowBorder_WidgetFlag,
                     iTrue);
     iZap(d->modeScroll);
     d->side = side;
diff --git a/src/ui/util.c b/src/ui/util.c
index 3a9bc400..e0b05a44 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -710,7 +710,8 @@ iWidget *makeMenu_Widget(iWidget *parent, const iMenuItem *items, size_t n) {
                 menu,
                 iClob(newKeyMods_LabelWidget(labelText, item->key, item->kmods, item->command)),
                 noBackground_WidgetFlag | frameless_WidgetFlag | alignLeft_WidgetFlag |
-                drawKey_WidgetFlag | (isInfo ? wrapText_WidgetFlag : 0) | itemFlags);
+                drawKey_WidgetFlag | itemFlags);
+            setWrap_LabelWidget(label, isInfo);
             haveIcons |= checkIcon_LabelWidget(label);
             updateSize_LabelWidget(label); /* drawKey was set */
             if (isInfo) {
@@ -776,7 +777,7 @@ void openMenuFlags_Widget(iWidget *d, iInt2 windowCoord, iBool postCommands) {
             if (isInstance_Object(i.object, &Class_LabelWidget)) {
                 iLabelWidget *label = i.object;
                 const iBool isCaution = startsWith_String(text_LabelWidget(label), uiTextCaution_ColorEscape);
-                if (flags_Widget(as_Widget(label)) & wrapText_WidgetFlag) {
+                if (isWrapped_LabelWidget(label)) {
                     continue;
                 }
                 if (deviceType_App() == desktop_AppDeviceType) {
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 4e1c9119..992f115d 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -1164,7 +1164,7 @@ void drawBackground_Widget(const iWidget *d) {
             shadowBorder = iFalse;
         }
     }
-    if (shadowBorder) {
+    if (shadowBorder && ~d->flags & noShadowBorder_WidgetFlag) {
         iPaint p;
         init_Paint(&p);
         drawSoftShadow_Paint(&p, bounds_Widget(d), 12 * gap_UI, black_ColorId, 30);
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 79565483..41784b99 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -92,7 +92,7 @@ enum iWidgetFlag {
 #define centerHorizontal_WidgetFlag         iBit64(33)
 #define moveToParentLeftEdge_WidgetFlag     iBit64(34)
 #define moveToParentRightEdge_WidgetFlag    iBit64(35)
-#define wrapText_WidgetFlag                 iBit64(36)
+#define noShadowBorder_WidgetFlag           iBit64(36)
 #define borderTop_WidgetFlag                iBit64(37)
 #define overflowScrollable_WidgetFlag       iBit64(38)
 #define focusRoot_WidgetFlag                iBit64(39)