From 75ea45a36b371b433b286a9852f1fdfa344b6558 Mon Sep 17 00:00:00 2001
From: Theron Tock <theron@netcitadel.com>
Date: Mon, 2 May 2011 15:45:46 -0700
Subject: [PATCH] Fixes #2374.

Set the dock width to 0 if objectView is floated or hidden.
---
 src/libgui/ProjectPanel.cpp | 40 ++++++++++++++++++++++++++++++++-----
 src/libgui/ProjectPanel.h   |  3 +++
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/src/libgui/ProjectPanel.cpp b/src/libgui/ProjectPanel.cpp
index 58cbd4bad..b281b7239 100644
--- a/src/libgui/ProjectPanel.cpp
+++ b/src/libgui/ProjectPanel.cpp
@@ -1037,8 +1037,8 @@ void ProjectPanel::showEvent(QShowEvent *ev)
 
     connect(m_panel->treeDockWidget, SIGNAL(topLevelChanged(bool)),
             this, SLOT(topLevelChangedForTreePanel(bool)));
-    // connect(m_panel->treeDockWidget, SIGNAL(visibilityChanged(bool)),
-    //         this, SLOT(visibilityChangedForTreePanel(bool)));
+    connect(m_panel->treeDockWidget, SIGNAL(visibilityChanged(bool)),
+            this, SLOT(visibilityChangedForTreePanel(bool)));
 
     m_panel->treeDockWidget->raise();
     QWidget::showEvent(ev);
@@ -1070,8 +1070,8 @@ void ProjectPanel::closeEvent(QCloseEvent * ev)
 
     disconnect(m_panel->treeDockWidget, SIGNAL(topLevelChanged(bool)),
                this, SLOT(topLevelChangedForTreePanel(bool)));
-    // disconnect(m_panel->treeDockWidget, SIGNAL(visibilityChanged(bool)),
-    //            this, SLOT(visibilityChangedForTreePanel(bool)));
+    disconnect(m_panel->treeDockWidget, SIGNAL(visibilityChanged(bool)),
+               this, SLOT(visibilityChangedForTreePanel(bool)));
 
     saveState();
     fileClose();
@@ -1274,6 +1274,31 @@ void ProjectPanel::toggleViewTree(bool f)
     else m_panel->treeDockWidget->hide();
 }
 
+
+/* Make the objectTree dock zero width if the objectTree is floating,
+   or if it's not visible.  Then the rules editor will take up the
+   full width */
+void ProjectPanel::adjustDockWidths(bool makeZeroWidth)
+{
+    /* These can be static since they are the same for every window
+       (they come from the .ui file) */
+    static int dockMinSize = 0;
+    static int dockMaxSize = 0;
+    if (dockMinSize == 0 && dockMaxSize == 0) {
+        dockMinSize = m_panel->treeDockWidgetParentFrame->minimumWidth();
+        dockMaxSize = m_panel->treeDockWidgetParentFrame->maximumWidth();
+    }
+
+    if (makeZeroWidth) {
+        m_panel->treeDockWidgetParentFrame->setMinimumWidth(0);
+        m_panel->treeDockWidgetParentFrame->setMaximumWidth(0);
+    } else {
+        m_panel->treeDockWidgetParentFrame->setMinimumWidth(dockMinSize);
+        m_panel->treeDockWidgetParentFrame->setMaximumWidth(dockMaxSize);
+    }
+}
+
+
 /*
  * Signal QDockWidget::topLevelChanged is called after dock widget
  * is made floating or docked.
@@ -1294,6 +1319,8 @@ void ProjectPanel::topLevelChangedForTreePanel(bool f)
      * is docked.
      */
 
+    adjustDockWidths(f);
+
     m_panel->treeDockWidget->blockSignals(true);
 
     if (f)  // window becomes detached
@@ -1356,6 +1383,9 @@ void ProjectPanel::visibilityChangedForTreePanel(bool f)
                  << "isWindow()=" << m_panel->treeDockWidget->isWindow()
                  << "mdiWindow->isMaximized()=" << mdiWindow->isMaximized();
 
+    adjustDockWidths(!f || m_panel->treeDockWidget->isFloating());
+
+#if 0
     if (m_panel->treeDockWidget->isVisible() &&
         ! m_panel->treeDockWidget->isWindow())  // visible and not floating
     {
@@ -1366,7 +1396,7 @@ void ProjectPanel::visibilityChangedForTreePanel(bool f)
         collapseTree();
         m_panel->treeDockWidget->widget()->update();
     }
-
+#endif
 }
 
 void ProjectPanel::setActive()
diff --git a/src/libgui/ProjectPanel.h b/src/libgui/ProjectPanel.h
index d020dda9b..0e2864e16 100644
--- a/src/libgui/ProjectPanel.h
+++ b/src/libgui/ProjectPanel.h
@@ -232,6 +232,9 @@ public:
     QString getPageTitle(bool file_path=false);
 
     void setActive();
+
+ private:
+    void adjustDockWidths(bool makeZeroWidth);
     
  public slots:
     void newObject();