probable fix for #425 (seems to work in my testcase), please test

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3205 17fca916-40b9-46aa-a4ea-0a15b648b75c

5 files changed, 10 insertions, 22 deletions

diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp
index 618f1ebc7..c6b262f09 100644
--- a/src/kvirc/ui/kvi_mdichild.cpp
+++ b/src/kvirc/ui/kvi_mdichild.cpp
@@ -354,11 +354,10 @@ void KviMdiChild::unsetClient()
 	setObjectName("mdi_child");
 }
 
-void KviMdiChild::activate(bool bSetFocus)
+void KviMdiChild::activate()
 {
 	if(m_pManager->topChild() != this)
-		m_pManager->setTopChild(this,bSetFocus);
-	else if(bSetFocus)setFocus();
+		m_pManager->setTopChild(this);
 }
 
 void KviMdiChild::focusInEvent(QFocusEvent *)
diff --git a/src/kvirc/ui/kvi_mdichild.h b/src/kvirc/ui/kvi_mdichild.h
index 099a753a5..679877b40 100644
--- a/src/kvirc/ui/kvi_mdichild.h
+++ b/src/kvirc/ui/kvi_mdichild.h
@@ -212,10 +212,9 @@ public:
 
 	/**
 	* \brief Activates this subwindow
-	* \param bSetFocus Sets if the input line gets the focus
 	* \return void
 	*/
-	void activate(bool bSetFocus);
+	void activate();
 
 	/**
 	* \brief Enqueue minimize status
diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp
index eacaba033..cc4b8bd30 100644
--- a/src/kvirc/ui/kvi_mdimanager.cpp
+++ b/src/kvirc/ui/kvi_mdimanager.cpp
@@ -148,7 +148,7 @@ void KviMdiManager::manageChild(KviMdiChild * lpC, bool, QRect *)
 void KviMdiManager::showAndActivate(KviMdiChild * lpC)
 {
 	lpC->show();
-	setTopChild(lpC,true);
+	setTopChild(lpC);
 	if(KVI_OPTION_BOOL(KviOption_boolAutoTileWindows))tile();
 }
 
@@ -157,7 +157,7 @@ KviMdiChild * KviMdiManager::topChild()
 	return (KviMdiChild*)activeSubWindow();
 };
 
-void KviMdiManager::setTopChild(KviMdiChild *lpC,bool bSetFocus)
+void KviMdiManager::setTopChild(KviMdiChild *lpC)
 {
 	__range_valid(lpC);
 	// The following check fails safely at startup....
@@ -171,15 +171,6 @@ void KviMdiManager::setTopChild(KviMdiChild *lpC,bool bSetFocus)
 	}
 
 	setActiveSubWindow((QMdiSubWindow*) lpC);
-
-	if(bSetFocus)
-	{
-		if(!lpC->hasFocus())
-		{
-			lpC->setFocus();
-		}
-	}
-
 }
 
 void KviMdiManager::destroyChild(KviMdiChild *lpC,bool bFocusTopChild)
@@ -363,9 +354,9 @@ bool KviMdiManager::isInSDIMode()
 
 void KviMdiManager::relayoutMenuButtons()
 {
-	// also force an activation of the top MdiChild since it probably didn't get it yet*/
+	// also force an activation of the top MdiChild since it probably didn't get it yet
 	KviMdiChild * c = topChild();
-	if(c) c->activate(false);
+	if(c) c->activate();
 }
 
 #define KVI_TILE_METHOD_ANODINE 0
@@ -488,7 +479,7 @@ void KviMdiManager::menuActivated(int id)
 	if(!lpC) return;
 	if(lpC->state() == KviMdiChild::Minimized) lpC->restore();
 
-	setTopChild(lpC, true);
+	setTopChild(lpC);
 }
 
 void KviMdiManager::ensureNoMaximized()
diff --git a/src/kvirc/ui/kvi_mdimanager.h b/src/kvirc/ui/kvi_mdimanager.h
index 6a7ee265b..0b9a75137 100644
--- a/src/kvirc/ui/kvi_mdimanager.h
+++ b/src/kvirc/ui/kvi_mdimanager.h
@@ -127,10 +127,9 @@ public:
 	/**
 	* \brief Bring the KviMdiChild to the foreground
 	* \param lpC The KviMdiChild
-	* \param bSetFocus If set the KviMdiChild will get the keyboard focus
 	* \return void
 	*/
-	void setTopChild(KviMdiChild * lpC, bool bSetFocus);
+	void setTopChild(KviMdiChild * lpC);
 
 	/**
 	* \brief Show the KviMdiChild and bring it to the front
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index 3325d5aee..9cf9c6288 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -931,7 +931,7 @@ void KviWindow::youAreUndocked()
 void KviWindow::activateSelf()
 {
 	if(mdiParent())
-		mdiParent()->activate(false);
+		mdiParent()->activate();
 
 	g_pFrame->childWindowActivated(this);
 	// this is now done by KviFrame in childWindowActivated