windowlist: fixed background color under win32

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

2 files changed, 10 insertions, 15 deletions

diff --git a/src/kvirc/ui/kvi_windowlist_tree.cpp b/src/kvirc/ui/kvi_windowlist_tree.cpp
index 30e60506a..dd124d3f5 100644
--- a/src/kvirc/ui/kvi_windowlist_tree.cpp
+++ b/src/kvirc/ui/kvi_windowlist_tree.cpp
@@ -78,7 +78,7 @@ KviTreeWindowListItem::KviTreeWindowListItem(KviTalTreeWidget * par,KviWindow *
 
 	m_pBox = new QWidget();
 	m_pBox->setLayout(&m_Layout);
-	treeWidget()->setItemWidget(this, 0, m_pBox);
+	treeWidget()->setItemWidget(this, 0, m_pBox);

 
 	//sort the widget
 	treeWidget()->sortItems(0,Qt::AscendingOrder);
@@ -161,9 +161,8 @@ void KviTreeWindowListItem::captionChanged()
 void KviTreeWindowListItem::refreshBrush()
 {
 	if(this == treeWidget()->currentItem())
-	{
+	{

 		setForeground(0, KVI_OPTION_COLOR(KviOption_colorTreeWindowListActiveForeground));
-		setBackground(0, KVI_OPTION_COLOR(KviOption_colorTreeWindowListActiveBackground));
 	} else {
 		int iLevel;
 		switch(m_iHighlightLevel)
@@ -176,7 +175,6 @@ void KviTreeWindowListItem::refreshBrush()
 			default: iLevel = KviOption_colorTreeWindowListForeground; break;
 		}
 		setForeground(0, KVI_OPTION_COLOR(iLevel));
-		setBackground(0, Qt::transparent);
 	}
 }
 
@@ -194,7 +192,6 @@ void KviTreeWindowListItem::refreshActivityIcon()
 			setActivityIcon(pix2);
 		}
 	}
-
 }
 void KviTreeWindowListItem::unhighlight()
 {
@@ -237,16 +234,15 @@ KviTreeWindowListTreeWidget::KviTreeWindowListTreeWidget(QWidget * par)
 	setObjectName("tree_windowlist");
 	setRootIsDecorated(true);
 	//Animation creates problem with the background painting on expande/collapse
-	//setAnimated(true);
+	//setAnimated(true);

 	setAllColumnsShowFocus(true);
-	setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-	setSelectionBehavior(QAbstractItemView::SelectItems);
 	setSelectionMode(QAbstractItemView::SingleSelection);
-	setFrameShape(NoFrame);
+        setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 }
 
 void KviTreeWindowListTreeWidget::mousePressEvent(QMouseEvent *e)
-{
+{

+
 	KviTreeWindowListItem * it = (KviTreeWindowListItem *)itemAt(e->pos());
 	if(it)
 	{
@@ -261,11 +257,12 @@ void KviTreeWindowListTreeWidget::mousePressEvent(QMouseEvent *e)
 					g_pFrame->setActiveWindow(wnd);
 				else wnd->minimize();
 			}
-			QTreeWidget::mousePressEvent(e);
+
 		} else if(e->button() & Qt::RightButton)
 		{
 			wnd->contextPopup();
-		}
+		}

+                KviTalTreeWidget::mousePressEvent(e);
 	} else {
 		if(e->button() & Qt::RightButton)
 		{
@@ -344,8 +341,6 @@ KviTreeWindowList::KviTreeWindowList()
 
 	//misc settings
 	m_pTreeWidget->setFont(KVI_OPTION_FONT(KviOption_fontTreeWindowList));
-	m_pTreeWidget->setFocusPolicy(Qt::NoFocus);
-	m_pTreeWidget->viewport()->setAutoFillBackground(false);
 
 	if(KVI_OPTION_BOOL(KviOption_boolShowTreeWindowListHeader))
 	{
diff --git a/src/kvirc/ui/kvi_windowlist_tree.h b/src/kvirc/ui/kvi_windowlist_tree.h
index 198cb3f70..4bc1d3efd 100644
--- a/src/kvirc/ui/kvi_windowlist_tree.h
+++ b/src/kvirc/ui/kvi_windowlist_tree.h
@@ -48,7 +48,7 @@ public:
 	inline void setText(QString& txt) { m_Text.setText(txt); };
 	inline void setWindowIcon(QPixmap& ico) { m_Icon.setPixmap(ico); };
 	inline void setContextIcon(QPixmap& ico) { m_Context.setPixmap(ico); };
-	inline void setActivityIcon(QPixmap& ico) { m_Activity.setPixmap(ico); };
+	inline void setActivityIcon(QPixmap& ico) { m_Activity.setPixmap(ico); };

 protected:
 	void refreshBrush();
 	void refreshActivityIcon();