Minor details in Mdi stuff

3 files changed, 26 insertions, 18 deletions

diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp
index accd6e117..693407e22 100644
--- a/src/kvirc/ui/KviConsoleWindow.cpp
+++ b/src/kvirc/ui/KviConsoleWindow.cpp
@@ -1098,7 +1098,7 @@ void KviConsoleWindow::applyOptions()
 
 void KviConsoleWindow::resizeEvent(QResizeEvent *)
 {
-	qDebug("Console window resize event %d,%d",width(),height());
+	//qDebug("Console window resize event %d,%d",width(),height());
 	int hght = m_pInput->heightHint();
 	int hght2 = m_pButtonBox->sizeHint().height();
 	m_pButtonBox->setGeometry(0,0,width(),hght2);
diff --git a/src/kvirc/ui/KviMainWindow.cpp b/src/kvirc/ui/KviMainWindow.cpp
index ac1d1b8e6..247adf13d 100644
--- a/src/kvirc/ui/KviMainWindow.cpp
+++ b/src/kvirc/ui/KviMainWindow.cpp
@@ -611,7 +611,9 @@ void KviMainWindow::addWindow(KviWindow *wnd,bool bShow)
 
 KviMdiChild * KviMainWindow::dockWindow(KviWindow * wnd)
 {
-	if(wnd->mdiParent())return wnd->mdiParent();
+	if(wnd->mdiParent())
+		return wnd->mdiParent();
+
 	KviMdiChild * lpC = new KviMdiChild(m_pMdi,"");
 	lpC->setClient(wnd);
 
diff --git a/src/kvirc/ui/KviMdiChild.cpp b/src/kvirc/ui/KviMdiChild.cpp
index 133f970c0..be79de9b4 100644
--- a/src/kvirc/ui/KviMdiChild.cpp
+++ b/src/kvirc/ui/KviMdiChild.cpp
@@ -53,14 +53,16 @@
 #endif
 
 KviMdiChild::KviMdiChild(KviMdiManager * par, const char * name)
-: QMdiSubWindow(par)
+: QMdiSubWindow(par->viewport())
 {
 	setObjectName(name ? name : "mdi_child");
 
 	m_pManager = par;
-	m_pClient = 0;
+	m_pClient = NULL;
 
 	connect(systemMenu(), SIGNAL(aboutToShow()), this, SLOT(updateSystemPopup()));
+	
+	// FIXME: This shouldn't be needed anymore?
 	QTimer::singleShot( 0, this, SLOT(transparencyWorkaround()));
 }
 
@@ -69,7 +71,7 @@ KviMdiChild::~KviMdiChild()
 	if(m_pClient)
 	{
 		delete m_pClient;
-		m_pClient=0;
+		m_pClient=NULL;
 	}
 	m_pManager->focusPreviousTopChild();
 }
@@ -205,8 +207,8 @@ void KviMdiChild::resizeEvent(QResizeEvent *e)
 
 void KviMdiChild::setClient(QWidget * w)
 {
-	KVI_ASSERT(m_pClient==0);
-	KVI_ASSERT(w!=0);
+	KVI_ASSERT(!m_pClient);
+	KVI_ASSERT(w);
 
 	m_pClient = w;
 	setWidget(w);
@@ -224,10 +226,13 @@ void KviMdiChild::setClient(QWidget * w)
 
 void KviMdiChild::unsetClient()
 {
-	KVI_ASSERT(m_pClient!=0);
-	if(!m_pClient)return;
-	setWidget(0);
-	m_pClient = 0;
+	KVI_ASSERT(m_pClient);
+	if(!m_pClient)
+		return;
+
+	setWidget(NULL);
+	m_pClient = NULL;
+
 	setObjectName("mdi_child");
 }
 
@@ -239,12 +244,13 @@ void KviMdiChild::activate()
 
 void KviMdiChild::updateSystemPopup()
 {
-	if(m_pClient)
-		if(m_pClient->inherits("KviWindow"))
-		{
-			systemMenu()->clear();
-			//FIXME this is an hack
-			KVS_TRIGGER_EVENT_0(KviEvent_OnWindowPopupRequest, ((KviWindow*) m_pClient));
-		}
+	if(!m_pClient)
+		return ;
+	if(!m_pClient->inherits("KviWindow"))
+		return;
+
+	systemMenu()->clear();
+	//FIXME this is an hack
+	KVS_TRIGGER_EVENT_0(KviEvent_OnWindowPopupRequest, ((KviWindow*) m_pClient));
 }