onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-19 17:57:22 +01:00
Code Issues Releases Wiki Activity

Fixes #2374.

Browse Source 
Set the dock width to 0 if objectView is floated or hidden.
This commit is contained in:
Theron Tock 2011-05-02 15:45:46 -07:00
parent b9187f57ca
commit 75ea45a36b
2 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/libgui/ProjectPanel.cpp
View File

@ -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()

3
src/libgui/ProjectPanel.h
View File

@ -232,6 +232,9 @@ public:
QString getPageTitle(bool file_path=false);
void setActive();
private:
void adjustDockWidths(bool makeZeroWidth);
public slots:
void newObject();