Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

1 files changed, 8 insertions, 4 deletions

diff --git a/src/FbTk/Container.cc b/src/FbTk/Container.cc
index 3374266..ce143ef 100644
--- a/src/FbTk/Container.cc
+++ b/src/FbTk/Container.cc
@@ -33,13 +33,14 @@ namespace FbTk {
 
 typedef CompareEqual_base<FbWindow, Window> CompareWindow;
 
-Container::Container(const FbWindow &parent):
+Container::Container(const FbWindow &parent, bool auto_resize):
     FbWindow(parent, 0, 0, 1, 1, ExposureMask),
     m_orientation(ROT0),
     m_align(RELATIVE),
     m_max_size_per_client(60),
     m_max_total_size(0),
-    m_update_lock(false) {
+    m_update_lock(false),
+    m_auto_resize(auto_resize) {
     EventManager::instance()->add(*this, *this);
 }
 
@@ -228,7 +229,10 @@ void Container::setMaxTotalSize(unsigned int size) {
 }
 
 void Container::setAlignment(Container::Alignment a) {
-    m_align = a;
+    if (m_align != a) {
+        m_align = a;
+        repositionItems();
+    }
 }
 
 void Container::exposeEvent(XExposeEvent &event) {
@@ -328,7 +332,7 @@ void Container::repositionItems() {
             } else
                 max_width_per_client = 1;
         }
-        if (total_width != cur_width) {
+        if (m_auto_resize && total_width != cur_width) {
             // calling Container::resize here risks infinite loops
             unsigned int neww = total_width, newh = height;
             translateSize(m_orientation, neww, newh);