aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Fabio Bas2010-06-04 16:16:02 +0000
committerGravatar Fabio Bas2010-06-04 16:16:02 +0000
commit73b32f1ca1b3776a612bba8eed59bc2a8e261c37 (patch)
treeb73184ef0b9f48107ce63cc54f69b7b43c31ba7a /src
parentdisbaled the ability to collapse the ircview and the userlist using the split... (diff)
downloadKVIrc-73b32f1ca1b3776a612bba8eed59bc2a8e261c37.tar.gz
KVIrc-73b32f1ca1b3776a612bba8eed59bc2a8e261c37.tar.bz2
KVIrc-73b32f1ca1b3776a612bba8eed59bc2a8e261c37.zip
mdi child: cache geometry to avoid a problem where a mdi subwindow that never gets shown returns minimumSize() as its geometry
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4420 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
-rw-r--r--src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp2
-rw-r--r--src/kvirc/ui/kvi_mdichild.cpp11
-rw-r--r--src/kvirc/ui/kvi_mdichild.h6
3 files changed, 17 insertions, 2 deletions
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
index be0698bf1..e47bc2134 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
@@ -516,6 +516,8 @@ namespace KviKvsCoreSimpleCommands
KVSCSC(cap)
{
+ Q_UNUSED(__pSwitches);
+
QString szCommand,szParams;
KVSCSC_PARAMETERS_BEGIN
KVSCSC_PARAMETER("command",KVS_PT_NONEMPTYSTRING,0,szCommand)
diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp
index 90e9a6adb..88bdd1c94 100644
--- a/src/kvirc/ui/kvi_mdichild.cpp
+++ b/src/kvirc/ui/kvi_mdichild.cpp
@@ -62,7 +62,7 @@ KviMdiChild::KviMdiChild(KviMdiManager * par, const char * name)
m_pManager = par;
m_pClient = 0;
- m_restoredGeometry = QRect(10,10,320,240);
+ m_restoredGeometry = QRect(10,10,500,380);
connect(systemMenu(), SIGNAL(aboutToShow()), this, SLOT(updateSystemPopup()));
connect(this, SIGNAL(windowStateChanged(Qt::WindowStates, Qt::WindowStates)), this, SLOT(windowStateChangedEvent(Qt::WindowStates, Qt::WindowStates)));
@@ -104,7 +104,7 @@ void KviMdiChild::closeEvent(QCloseEvent * e)
QRect KviMdiChild::restoredGeometry()
{
- return geometry();
+ return m_restoredGeometry;
}
KviMdiChild::MdiChildState KviMdiChild::state()
@@ -223,9 +223,16 @@ void KviMdiChild::moveEvent(QMoveEvent *e)
}
}
#endif
+ m_restoredGeometry.setTopLeft(e->pos());
QMdiSubWindow::moveEvent(e);
}
+void KviMdiChild::resizeEvent(QResizeEvent *e)
+{
+ m_restoredGeometry.setSize(e->size());
+ QMdiSubWindow::resizeEvent(e);
+}
+
void KviMdiChild::setClient(QWidget * w)
{
__range_valid(m_pClient==0);
diff --git a/src/kvirc/ui/kvi_mdichild.h b/src/kvirc/ui/kvi_mdichild.h
index 891ee08a4..4968fe990 100644
--- a/src/kvirc/ui/kvi_mdichild.h
+++ b/src/kvirc/ui/kvi_mdichild.h
@@ -178,6 +178,12 @@ protected:
virtual void moveEvent(QMoveEvent * e);
/**
+ * \brief Updates the widget geometry when resizing
+ * \return void
+ */
+ virtual void resizeEvent(QResizeEvent * e);
+
+ /**
* \brief Hooks into close event to make user decisions possible
* \return void
*/