1 files changed, 28 insertions, 27 deletions

diff --git a/src/ui/widget.c b/src/ui/widget.c
index 11ec1b07..85672c04 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -760,16 +760,24 @@ void arrange_Widget(iWidget *d) {
 }
 
 iBool isBeingVisuallyOffsetByReference_Widget(const iWidget *d) {
-    if (d->flags & refChildrenOffset_WidgetFlag) {
+    return visualOffsetByReference_Widget(d) != 0;
+}
+
+int visualOffsetByReference_Widget(const iWidget *d) {
+    if (d->offsetRef && d->flags & refChildrenOffset_WidgetFlag) {
+        int offX = 0;
         iConstForEach(ObjectList, i, children_Widget(d->offsetRef)) {
             const iWidget *child = i.object;
             if (child == d) continue;
             if (child->flags & (visualOffset_WidgetFlag | dragged_WidgetFlag)) {
-                return iTrue;
+//                const float factor = width_Widget(d) / (float) size_Root(d->root).x;
+                const int invOff = width_Widget(d) - iRound(value_Anim(&child->visualOffset));
+                offX -= invOff / 4;
             }
         }
+        return offX;
     }
-    return iFalse;
+    return 0;
 }
 
 static void applyVisualOffset_Widget_(const iWidget *d, iInt2 *pos) {
@@ -786,14 +794,7 @@ static void applyVisualOffset_Widget_(const iWidget *d, iInt2 *pos) {
         pos->y -= value_Anim(d->animOffsetRef);
     }
     if (d->flags & refChildrenOffset_WidgetFlag) {
-        iConstForEach(ObjectList, i, children_Widget(d->offsetRef)) {
-            const iWidget *child = i.object;
-            if (child == d) continue;
-            if (child->flags & (visualOffset_WidgetFlag | dragged_WidgetFlag)) {
-                const int invOff = size_Root(d->root).x - iRound(value_Anim(&child->visualOffset));
-                pos->x -= invOff / 4;
-            }
-        }
+        pos->x += visualOffsetByReference_Widget(d);
     }
 }
 
@@ -1081,7 +1082,9 @@ iBool processEvent_Widget(iWidget *d, const SDL_Event *ev) {
                         if (~d->flags & dragged_WidgetFlag) {
                             setFlags_Widget(d, dragged_WidgetFlag, iTrue);
                         }
-                        setVisualOffset_Widget(d, arg_Command(command_UserEvent(ev)), 10, 0);
+                        setVisualOffset_Widget(d, arg_Command(command_UserEvent(ev)) *
+                                               width_Widget(d) / size_Root(d->root).x,
+                                               10, 0);
                         return iTrue;
                     }
                 }
@@ -1129,6 +1132,17 @@ iBool processEvent_Widget(iWidget *d, const SDL_Event *ev) {
     return iFalse;
 }
 
+int backgroundFadeColor_Widget(void) {
+    switch (colorTheme_App()) {
+        case light_ColorTheme:
+            return gray25_ColorId;
+        case pureWhite_ColorTheme:
+            return gray50_ColorId;
+        default:
+            return black_ColorId;
+    }
+}
+
 void drawBackground_Widget(const iWidget *d) {
     if (d->flags & noBackground_WidgetFlag) {
         return;
@@ -1151,8 +1165,7 @@ void drawBackground_Widget(const iWidget *d) {
         drawSoftShadow_Paint(&p, bounds_Widget(d), 12 * gap_UI, black_ColorId, 30);
     }
     const iBool isFaded = fadeBackground &&
-                          ~d->flags & noFadeBackground_WidgetFlag;/* &&
-                          ~d->flags & destroyPending_WidgetFlag;*/
+                          ~d->flags & noFadeBackground_WidgetFlag;
     if (isFaded) {
         iPaint p;
         init_Paint(&p);
@@ -1163,19 +1176,7 @@ void drawBackground_Widget(const iWidget *d) {
             p.alpha *= (area > 0 ? visibleArea / area : 0.0f);
         }
         SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_BLEND);
-        int fadeColor;
-        switch (colorTheme_App()) {
-            default:
-                fadeColor = black_ColorId;
-                break;
-            case light_ColorTheme:
-                fadeColor = gray25_ColorId;
-                break;
-            case pureWhite_ColorTheme:
-                fadeColor = gray50_ColorId;
-                break;
-        }
-        fillRect_Paint(&p, rect_Root(d->root), fadeColor);
+        fillRect_Paint(&p, rect_Root(d->root), backgroundFadeColor_Widget());
         SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_NONE);
     }
     if (d->bgColor >= 0 || d->frameColor >= 0) {