fixed crash when undocking windows with a shared background

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

6 files changed, 11 insertions, 7 deletions

diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 981f1c5a6..fd724d94c 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -89,7 +89,7 @@ KviDccChat::KviDccChat(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name)
 {
 	m_pButtonBox = new KviTalHBox(this);
 
-	m_pLabel = new KviThemedLabel(m_pButtonBox,"dcc_chat_label");
+	m_pLabel = new KviThemedLabel(m_pButtonBox, this, "dcc_chat_label");
 	m_pLabel->setText(name);
 	m_pButtonBox->setStretchFactor(m_pLabel,1);
 
diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp
index 65474622e..ad7329db5 100644
--- a/src/modules/filetransferwindow/filetransferwindow.cpp
+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
@@ -192,7 +192,7 @@ void KviFileTransferWidget::paintEvent(QPaintEvent * event)
 		p->restore();
 	} else if(g_pShadedChildGlobalDesktopBackground)
 	{
-		QPoint pnt = viewport()->mapTo(g_pFrame, rect.topLeft() + g_pFrame->mdiManager()->scrollBarsOffset());
+		QPoint pnt = g_pFileTransferWindow->mdiParent() ? viewport()->mapTo(g_pFrame, rect.topLeft() + g_pFrame->mdiManager()->scrollBarsOffset()) : viewport()->mapTo(g_pFileTransferWindow, rect.topLeft());
 		p->drawTiledPixmap(rect,*(g_pShadedChildGlobalDesktopBackground), pnt);
 	} else {
 #endif
@@ -240,7 +240,8 @@ KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,Kv
 : KviWindow(KVI_WINDOW_TYPE_TOOL,lpFrm,"file transfer window",0) , KviModuleExtension(d)
 {
 	g_pFileTransferWindow = this;
-
+	setAutoFillBackground(false);
+	
 	m_pContextPopup = 0;
 	m_pLocalFilePopup = 0;
 	m_pOpenFilePopup = 0;
diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp
index 593fc793a..926ec3662 100644
--- a/src/modules/iograph/libkviiograph.cpp
+++ b/src/modules/iograph/libkviiograph.cpp
@@ -45,6 +45,7 @@ KviIOGraphWindow::KviIOGraphWindow(KviModuleExtensionDescriptor * d,KviFrame * l
 : KviWindow(KVI_WINDOW_TYPE_IOGRAPH,lpFrm,name), KviModuleExtension(d)
 {
 	m_pIOGraph = new KviIOGraphWidget(this);
+	setAutoFillBackground(false);
 }
 
 KviIOGraphWindow::~KviIOGraphWindow()
@@ -106,7 +107,7 @@ void KviIOGraphWindow::paintEvent(QPaintEvent * e)
 		p.restore();
 	} else if(g_pShadedChildGlobalDesktopBackground)
 	{
-		QPoint pnt = mapTo(g_pFrame, rect.topLeft() + g_pFrame->mdiManager()->scrollBarsOffset());
+		QPoint pnt = mdiParent() ? mapTo(g_pFrame, rect.topLeft() + g_pFrame->mdiManager()->scrollBarsOffset()) : rect.topLeft();
 		p.drawTiledPixmap(rect,*(g_pShadedChildGlobalDesktopBackground), pnt);
 	} else {
 #endif
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
index ce033b02c..bb4c545d3 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/linkswindow.cpp
@@ -65,7 +65,7 @@ KviLinksWindow::KviLinksWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 
 	QLabel * l = new QLabel(box);
 	box->setStretchFactor(l,1);
-	m_pInfoLabel = new KviThemedLabel(m_pTopSplitter,"info_label");
+	m_pInfoLabel = new KviThemedLabel(m_pTopSplitter, this, "info_label");
 
 	connect(lpConsole->context(),SIGNAL(stateChanged()),
 		this,SLOT(connectionStateChange()));
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
index 5a90f3e5f..290504b7c 100644
--- a/src/modules/list/listwindow.cpp
+++ b/src/modules/list/listwindow.cpp
@@ -200,7 +200,7 @@ KviListWindow::KviListWindow(KviFrame * lpFrm, KviConsole * lpConsole)
 
 	connect(m_pParamsEdit,SIGNAL(textEdited(const QString &)),this,SLOT(liveSearch(const QString &)));
 
-	m_pInfoLabel = new KviThemedLabel(m_pTopSplitter,"info_label");
+	m_pInfoLabel = new KviThemedLabel(m_pTopSplitter, this, "info_label");
 
 	m_pTreeWidget  = new QTreeWidget(m_pVertSplitter);
 	m_pTreeWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 0afc94971..98efaa2e7 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -122,7 +122,7 @@ void KviUrlDialogTreeWidget::paintEvent(QPaintEvent * event)
 		p->restore();
 	} else if(g_pShadedChildGlobalDesktopBackground)
 	{
-		QPoint pnt = viewport()->mapTo(g_pFrame, rect.topLeft() + g_pFrame->mdiManager()->scrollBarsOffset());
+		QPoint pnt = ((KviWindow*)parent())->mdiParent() ? viewport()->mapTo(g_pFrame, rect.topLeft() + g_pFrame->mdiManager()->scrollBarsOffset()) : viewport()->mapTo((KviWindow*)parent(), rect.topLeft());
 		p->drawTiledPixmap(rect,*(g_pShadedChildGlobalDesktopBackground), pnt);
 	} else {
 #endif
@@ -171,6 +171,8 @@ QPixmap * KviUrlAction::smallIcon()
 UrlDialog::UrlDialog(KviPointerList<KviUrl> *)
 :KviWindow(KVI_WINDOW_TYPE_TOOL,g_pFrame,"URL List")
 {
+	setAutoFillBackground(false);
+	
 	m_pUrlList = new KviUrlDialogTreeWidget(this);
 
 	m_pMenuBar = new KviTalMenuBar(this,"url menu");