fix for #424

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

3 files changed, 34 insertions, 57 deletions

diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp
index e0274a212..fa631e9ef 100644
--- a/src/kvirc/ui/kvi_statusbar.cpp
+++ b/src/kvirc/ui/kvi_statusbar.cpp
@@ -486,58 +486,44 @@ void KviStatusBar::mousePressEvent(QMouseEvent * e)
 	}
 }
 
-void KviStatusBar::mouseMoveEvent(QMouseEvent * e)
+void KviStatusBar::mouseReleaseEvent(QMouseEvent * e)
 {
-
-	if(!m_pClickedApplet)
-		return;
-	if(!appletExists(m_pClickedApplet))
-		return;
-
-	KviStatusBarApplet * pApplet = (KviStatusBarApplet *) childAt(e->pos());
-
-	if(pApplet == m_pClickedApplet)
-		return;
-
-	// move!
-	if(!pApplet)
+	if(e->button() == Qt::LeftButton)
 	{
-		pApplet = m_pAppletList->first();
-		while(pApplet)
+		if(m_pClickedApplet && appletExists(m_pClickedApplet))
 		{
-			if(e->pos().x() < (pApplet->x()+pApplet->width()))
-			{
-				break;
-			} else {
-				pApplet = m_pAppletList->next();
-			}
-		}
-		if(!pApplet || pApplet == m_pClickedApplet)
-			return; // no way to move
-	}
+			KviStatusBarApplet * pApplet = (KviStatusBarApplet *) childAt(e->pos());
 
-	printf("inverting %d and %d\n",m_pClickedApplet->index(),pApplet->index());
+			if(pApplet == m_pClickedApplet)
+				return;
 
-	//swap indexes
-	int oldIndex = m_pClickedApplet->index();
-	m_pClickedApplet->setIndex(pApplet->index());
-	pApplet->setIndex(oldIndex);
+			// move!
+			if(!pApplet)
+			{
+				pApplet = m_pAppletList->first();
+				while(pApplet)
+				{
+					if(e->pos().x() < (pApplet->x()+pApplet->width()))
+					{
+						break;
+					} else {
+						pApplet = m_pAppletList->next();
+					}
+				}
+				if(!pApplet || pApplet == m_pClickedApplet)
+					return; // no way to move
+			}
 
-	removeWidget(m_pClickedApplet); //Note: This function does not delete the widget but hides it. To add the widget again, you must call both the addWidget() and show() functions.
-	insertPermanentWidget(m_pClickedApplet->index(), m_pClickedApplet);
-	m_pClickedApplet->show();
+			//swap indexes
+			int oldIndex = m_pClickedApplet->index();
+			int newIndex = pApplet->index();
+			m_pClickedApplet->setIndex(newIndex);
+			pApplet->setIndex(oldIndex);
 
-	m_pClickedApplet->select(false);
-	g_pApp->restoreOverrideCursor();
-	m_pClickedApplet = 0;
-}
+			removeWidget(m_pClickedApplet); //Note: This function does not delete the widget but hides it. To add the widget again, you must call both the addWidget() and show() functions.
+			insertPermanentWidget(newIndex, m_pClickedApplet);
+			m_pClickedApplet->show();
 
-void KviStatusBar::mouseReleaseEvent(QMouseEvent * e)
-{
-	if(e->button() == Qt::LeftButton)
-	{
-		if(m_pClickedApplet && appletExists(m_pClickedApplet))
-		{
 			m_pClickedApplet->select(false);
 			g_pApp->restoreOverrideCursor();
 			m_pClickedApplet = 0;
diff --git a/src/kvirc/ui/kvi_statusbar.h b/src/kvirc/ui/kvi_statusbar.h
index 9424b5a44..399305ab9 100644
--- a/src/kvirc/ui/kvi_statusbar.h
+++ b/src/kvirc/ui/kvi_statusbar.h
@@ -313,7 +313,6 @@ protected slots:
 protected:
 	//virtual void paintEvent(QPaintEvent * e);
 	virtual void mousePressEvent(QMouseEvent * e);
-	virtual void mouseMoveEvent(QMouseEvent * e);
 	virtual void mouseReleaseEvent(QMouseEvent * e);
 	virtual void mouseDoubleClickEvent(QMouseEvent * e);
 	//virtual void resizeEvent(QResizeEvent * e);
diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/kvi_statusbarapplet.cpp
index 2e353fd82..0dbc9d79e 100644
--- a/src/kvirc/ui/kvi_statusbarapplet.cpp
+++ b/src/kvirc/ui/kvi_statusbarapplet.cpp
@@ -126,18 +126,10 @@ void KviStatusBarApplet::paintEvent(QPaintEvent * e)
 	if(m_bSelected)
 	{
 		QPainter p(this);
-	// workaround to fix "Warning:QPainter::setCompositionMode: PorterDuff modes not supported on device on win"
-#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-			QPalette pal=palette();
-			QColor col=pal.highlight().color();
-			col.setAlpha(127);
-			p.fillRect(rect(),QBrush(col));
-#else
-			
-		p.setCompositionMode(QPainter::CompositionMode_SourceOut);
-		p.fillRect(rect(),Qt::black);
-		p.setCompositionMode(QPainter::CompositionMode_SourceOver);
-#endif
+		QPalette pal=palette();
+		QColor col=pal.highlight().color();
+		col.setAlpha(127);
+		p.fillRect(rect(),QBrush(col));
 	}
 }