From 5041b901d063d7d380c61c08090c72b33bb00e9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaakko=20Ker=C3=A4nen?= <jaakko.keranen@iki.fi>
Date: Sat, 2 Jan 2016 18:54:08 +0200
Subject: [PATCH] UI|Client: Improved sidebar layout

Take header widget width into account when positioning groups.
---
 .../client/src/ui/editors/variablegroupeditor.cpp     |  6 ++++++
 doomsday/apps/client/src/ui/widgets/sidebarwidget.cpp | 11 -----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/doomsday/apps/client/src/ui/editors/variablegroupeditor.cpp b/doomsday/apps/client/src/ui/editors/variablegroupeditor.cpp
index 96d8aa1a05..cf7d19b409 100644
--- a/doomsday/apps/client/src/ui/editors/variablegroupeditor.cpp
+++ b/doomsday/apps/client/src/ui/editors/variablegroupeditor.cpp
@@ -286,6 +286,12 @@ void VariableGroupEditor::commit()
                       OperatorRule::maximum(w->rule().width(), d->firstColumnWidth));
         }
     }
+    if(d->header)
+    {
+        // Make sure the editor is wide enough to fit the entire header.
+        d->content->rule().setInput(Rule::Width,
+                OperatorRule::maximum(d->layout.width(), d->header->rule().width()));
+    }
 }
 
 void VariableGroupEditor::fetch()
diff --git a/doomsday/apps/client/src/ui/widgets/sidebarwidget.cpp b/doomsday/apps/client/src/ui/widgets/sidebarwidget.cpp
index 6e7ea713e8..00f6df9330 100644
--- a/doomsday/apps/client/src/ui/widgets/sidebarwidget.cpp
+++ b/doomsday/apps/client/src/ui/widgets/sidebarwidget.cpp
@@ -84,17 +84,6 @@ SidebarWidget::SidebarWidget(String const &titleText, String const &name)
 
     d->layout.reset(new SequentialLayout(area.left(), d->title->rule().bottom(), Down));
 
-    // Update container size.
-    // Now we can define the first column width.
-#if 0
-    d->container->setContentSize(OperatorRule::maximum(d->layout->width(),
-                                                       /*profLabel->rule().width() +
-                                                       d->profile->rule().width() +
-                                                       d->profile->button().rule().width(),*/
-                                                       style().rules().rule("sidebar.width")),
-                                 title->rule().height() + d->layout->height());
-#endif
-
     d->container->rule().setSize(d->container->contentRule().width() +
                                  d->container->margins().width(),
                                  rule().height());