UI: properly inherit hgrow for tabbed

black-sliver · Nov 27, 2024 · 137b018 · 137b018
1 parent 7946771
commit 137b018
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/ui/trackerview.cpp b/src/ui/trackerview.cpp
@@ -562,7 +562,7 @@ bool TrackerView::addLayoutNode(Container* container, const LayoutNode& node, si
     if (node.getType() == "container" || node.getType() == "tab") {
         Container *w = new SimpleContainer(0,0,container->getWidth(),container->getHeight());
         w->setDropShaodw(node.getDropShadow(container->getDropShadow()));
-        w->setGrow(1,1); // required at the moment -- TODO: make this depend on children
+        w->setGrow(0,1); // required at the moment -- TODO: make this depend on children
         if (!node.getBackground().empty()) w->setBackground(node.getBackground());
         addLayoutNodes(w, children, depth+1);
         container->addChild(w);
@@ -631,7 +631,7 @@ bool TrackerView::addLayoutNode(Container* container, const LayoutNode& node, si
         //       + a private hbox for tab buttons
         Tabs *w = new Tabs(0,0,container->getWidth(),container->getHeight(),_font);
         w->setDropShaodw(node.getDropShadow(container->getDropShadow()));
-        w->setGrow(1,1); // required at the moment -- TODO: make this depend on children
+        w->setGrow(0,1); // required at the moment -- TODO: make this depend on children
         if (!node.getBackground().empty())
             w->setBackground(node.getBackground());
         if (children.empty())

diff --git a/src/uilib/tabs.cpp b/src/uilib/tabs.cpp
@@ -66,6 +66,8 @@ void Tabs::addChild(Widget* w)
 {
     w->setVisible(false);
     _children.push_back(w);
+    if (w->getHGrow() > _hGrow)
+        _hGrow = w->getHGrow();
     Button* btn = new Button(0,0,0,0,_font,"Tab");
     btn->setSize(btn->getMinSize());
     btn->onClick += {this, [this](void* sender,int x, int y, int btn) {