fix for #650 (involves a different patch for #619)

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

2 files changed, 8 insertions, 12 deletions

diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp
index cd6194248..d482b6874 100644
--- a/src/kvirc/ui/kvi_mdichild.cpp
+++ b/src/kvirc/ui/kvi_mdichild.cpp
@@ -139,14 +139,6 @@ void KviMdiChild::windowStateChangedEvent(Qt::WindowStates oldState, Qt::WindowS
 		}
 	}
 
-	if(newState.testFlag(Qt::WindowActive) && diffState.testFlag(Qt::WindowActive))
-	{
-		if(m_pClient->inherits("KviWindow")) // actually this is always the case
-		{
-			((KviWindow *)m_pClient)->activateSelf();
-		}
-	}
-
 	if(newState.testFlag(Qt::WindowActive) && diffState.testFlag(Qt::WindowMaximized))
 	{
 		//i'm the active window and my maximized state has changed => update sdi mode
@@ -180,12 +172,18 @@ void KviMdiChild::restore()
 
 void KviMdiChild::maximize()
 {
-	showMaximized();
+	if(isVisible())
+		showMaximized();
+	else
+		setWindowState(windowState() & ~Qt::WindowMaximized);
 }
 
 void KviMdiChild::minimize()
 {
-	showMinimized();
+	if(isVisible())
+		showMinimized();
+	else
+		setWindowState(windowState() & ~Qt::WindowMinimized);
 }
 
 void KviMdiChild::updateCaption()
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index 0e151280f..1f140bf1b 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -1195,8 +1195,6 @@ KviWindow * KviWindow::outputProxy()
 
 void KviWindow::lostUserFocus()
 {
-	unhighlight();
-
 	if(!m_pIrcView)return;
 	if(m_pIrcView->hasLineMark())m_pIrcView->clearLineMark(true);
 }