onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-25 12:47:44 +01:00
Code Issues Releases Wiki Activity

fixes #1207

Browse Source
This commit is contained in:
Vadim Kurland 2010-02-03 00:32:51 +00:00
parent 62e7dcc5e2
commit 312faac34b
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_num
View File

@ -1 +1 @@
#define BUILD_NUM 2492
#define BUILD_NUM 2493

5
doc/ChangeLog
View File

@ -1,3 +1,8 @@
2010-02-02 glitch.vk.crocodile.org <vadim@vk.crocodile.org>
* FWWindow.cpp (FWWindow::closeEvent): fixes #1207 'status
"maximized" of internal subwindows is not saved correctly'
2010-02-01 vadim <vadim@vk.crocodile.org>
* FWWindow.cpp (FWWindow::fileExit): fixes #1197 "clicking Cancel

8
src/gui/FWWindow.cpp
View File

@ -424,6 +424,9 @@ void FWWindow::showSub(ProjectPanel *pp)
sub->setAttribute(Qt::WA_DeleteOnClose);
m_mainWindow->m_space->addSubWindow(sub);
if (fwbdebug)
qDebug() << "Show subwindow maximized: " << windows_maximized;
if (windows_maximized)
pp->setWindowState(Qt::WindowMaximized);
else
@ -1090,7 +1093,8 @@ void FWWindow::subWindowActivated(QMdiSubWindow *subwindow)
qDebug() << "FWWindow::subWindowActivated subwindow="
<< subwindow
<< " "
<< subwindow->windowTitle();
<< subwindow->windowTitle()
<< "isMaximized()=" << subwindow->isMaximized();
if (previous_subwindow == subwindow) return;
@ -1159,7 +1163,7 @@ void FWWindow::closeEvent(QCloseEvent* ev)
if (fwbdebug) qDebug("FWWindow::closeEvent");
if (activeProject())
st->setInt("Window/maximized", activeProject()->isMaximized());
st->setInt("Window/maximized", activeProject()->mdiWindow->isMaximized());
QList<QMdiSubWindow *> subWindowList = m_mainWindow->m_space->subWindowList();
for (int i = 0 ; i < subWindowList.size();i++)

3
src/gui/ProjectPanel.cpp
View File

@ -1055,7 +1055,8 @@ void ProjectPanel::visibilityChangedForTreePanel(bool f)
qDebug() << "ProjectPanel::visibilityChangedForTreePanel f="
<< f
<< "isVisible()=" << m_panel->treeDockWidget->isVisible()
<< "isWindow()=" << m_panel->treeDockWidget->isWindow();
<< "isWindow()=" << m_panel->treeDockWidget->isWindow()
<< "mdiWindow->isMaximized()=" << mdiWindow->isMaximized();
if (m_panel->treeDockWidget->isVisible() &&
! m_panel->treeDockWidget->isWindow()) // visible and not floating

4
src/gui/ProjectPanel_state_ops.cpp
View File

@ -83,14 +83,14 @@ void ProjectPanel::loadState(bool)
if (fwbdebug)
{
qDebug("ProjectPanel::loadState filename=%s isMaximized=%d",
filename.toAscii().data(), isMaximized());
filename.toAscii().data(), mdiWindow->isMaximized());
qDebug("mdiWindow=%p", mdiWindow);
qDebug("ready=%d", ready);
}
if (!ready) return;
if (!isMaximized() && mdiWindow)
if (!mdiWindow->isMaximized() && mdiWindow)
{
if (fwbdebug) qDebug("ProjectPanel::loadState show normal");
setWindowState(0);