Add inner left box to hide the padded outer box

Fixes: #78
scorpion-26 · Mar 17, 2024 · 1cf8f82 · 1cf8f82
1 parent cb160d8
commit 1cf8f82
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/Bar.cpp b/src/Bar.cpp
@@ -1241,18 +1241,24 @@ namespace Bar
                 endLeftWidgets = -1;
             }
 
+            auto leftWithPadding = Widget::Create<Box>();
+            leftWithPadding->SetSpacing({6, false});
+            leftWithPadding->SetClass("left-with-padding");
+            leftWithPadding->SetOrientation(Utils::GetOrientation());
+            // For centerTime the width of the left widget handles the centering.
+            // For not centerTime we want to set it as much right as possible. So let this expand as much as possible.
+            Utils::SetTransform(*leftWithPadding, {endLeftWidgets, !Config::Get().centerWidgets, Alignment::Left, 12, 0});
+
             auto left = Widget::Create<Box>();
-            left->SetSpacing({6, false});
             left->SetClass("left");
             left->SetOrientation(Utils::GetOrientation());
-            // For centerTime the width of the left widget handles the centering.
-            // For not centerTime we want to set it as much right as possible. So let this expand as much as possible.
-            Utils::SetTransform(*left, {endLeftWidgets, !Config::Get().centerWidgets, Alignment::Left, 12, 0});
+            Utils::SetTransform(*left, {-1, false, Alignment::Left});
 
             for (auto& widget : Config::Get().widgetsLeft)
             {
                 ChooseWidgetToDraw(widget, *left, Side::Left);
             }
+            leftWithPadding->AddChild(std::move(left));
 
             auto center = Widget::Create<Box>();
             center->SetClass("center");
@@ -1276,7 +1282,7 @@ namespace Bar
                 ChooseWidgetToDraw(widget, *right, Side::Right);
             }
 
-            mainWidget->AddChild(std::move(left));
+            mainWidget->AddChild(std::move(leftWithPadding));
             mainWidget->AddChild(std::move(center));
             mainWidget->AddChild(std::move(right));
         }