fix for #1119

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

2 files changed, 32 insertions, 14 deletions

diff --git a/src/modules/dcc/DccVideoWindow.cpp b/src/modules/dcc/DccVideoWindow.cpp
index f3bca6bd9..fd4c9051e 100644
--- a/src/modules/dcc/DccVideoWindow.cpp
+++ b/src/modules/dcc/DccVideoWindow.cpp
@@ -422,21 +422,26 @@ DccVideoWindow::DccVideoWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const cha
 	m_pSlaveThread = 0;
 	m_pszTarget = 0;
 
-	m_pLayout = new QGridLayout(this);
-
 	m_pButtonBox = new KviTalHBox(this);
 
-	m_pLabel = new KviThemedLabel(m_pButtonBox, this, "dcc_chat_label");
+	m_pLabel = new KviThemedLabel(m_pButtonBox, this, "dcc_video_label");
 	m_pLabel->setText(name);
 	m_pButtonBox->setStretchFactor(m_pLabel,1);
 
-	m_pButtonContainer= new KviTalHBox(m_pButtonBox);
-	createTextEncodingButton(m_pButtonContainer);
+	createTextEncodingButton(m_pButtonBox);
 
 #ifdef COMPILE_CRYPT_SUPPORT
-	createCryptControllerButton(m_pButtonContainer);
+	createCryptControllerButton(m_pButtonBox);
 #endif
-	m_pLayout->addWidget(m_pButtonBox, 0, 0, 1, 3);
+
+	// Central splitter
+	m_pSplitter = new KviTalSplitter(Qt::Horizontal,this);
+	m_pSplitter->setObjectName("dcc_video_splitter");
+	m_pSplitter->setChildrenCollapsible(false);
+
+	m_pContainerWidget = new QWidget(m_pSplitter);
+	m_pLayout = new QGridLayout(m_pContainerWidget);
+	m_pContainerWidget->setLayout(m_pLayout);
 
 	m_pIrcView  = new KviIrcView(this,pFrm,this);
 	connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked()));
@@ -483,11 +488,8 @@ DccVideoWindow::DccVideoWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const cha
 	m_pLayout->addWidget(m_pCStandards, 6, 2, 1, 1);
 
 	m_pLayout->addWidget(m_pIrcView, 7, 0, 1, 3);
-	m_pLayout->addWidget(m_pInput, 8, 0, 1, 3);
 	m_pLayout->setRowStretch(7,1);
 
-	setLayout(m_pLayout);
-
 	if(KVI_OPTION_BOOL(KviOption_boolAutoLogDccChat))m_pIrcView->startLogging();
 
 	connect(&m_Timer, SIGNAL(timeout()), this, SLOT(slotUpdateImage()) );
@@ -566,6 +568,22 @@ DccVideoWindow::~DccVideoWindow()
 	}
 }
 
+void DccVideoWindow::resizeEvent(QResizeEvent *)
+{
+	int iHeight = m_pInput->heightHint();
+	int iHeight2 = m_pButtonBox->sizeHint().height();
+	m_pButtonBox->setGeometry(0,0,width(),iHeight2);
+	m_pSplitter->setGeometry(0,iHeight2,width(),height() - (iHeight + iHeight2));
+	m_pInput->setGeometry(0,height() - iHeight, width(),iHeight);
+}
+
+QSize DccVideoWindow::sizeHint() const
+{
+	QSize ret(m_pSplitter->sizeHint().width(),
+		m_pContainerWidget->sizeHint().height() + m_pButtonBox->sizeHint().height());
+	return ret;
+}
+
 void DccVideoWindow::textViewRightClicked()
 {
 	KVS_TRIGGER_EVENT_1(KviEvent_OnDCCChatPopupRequest,this,m_pDescriptor->idString());
diff --git a/src/modules/dcc/DccVideoWindow.h b/src/modules/dcc/DccVideoWindow.h
index b0cc2c7f4..edd6fd02a 100644
--- a/src/modules/dcc/DccVideoWindow.h
+++ b/src/modules/dcc/DccVideoWindow.h
@@ -113,9 +113,7 @@ public:
 	~DccVideoWindow();
 protected:
 	KviThemedLabel         * m_pLabel;
-	KviTalHBox             * m_pButtonBox;
-	KviTalHBox             * m_pButtonContainer;
-
+	QWidget                * m_pContainerWidget;
 	QLabel                 * m_pInVideoLabel;
 	QLabel                 * m_pOutVideoLabel;
 	QComboBox              * m_pCDevices;
@@ -125,7 +123,7 @@ protected:
 	QTimer                   m_Timer;
 	QLabel                 * m_pVideoLabel[2];
 	QString                * m_pszTarget;
-	DccVideoThread      * m_pSlaveThread;
+	DccVideoThread         * m_pSlaveThread;
 	QByteArray               m_tmpTextDataOut;
 	QString                  m_szLocalNick;
 protected:
@@ -142,6 +140,8 @@ protected:
 	virtual const QString & localNick();
 	virtual void ownMessage(const QString &text, bool bUserFeedback = true);
 	virtual void ownAction(const QString &text);
+	virtual void resizeEvent(QResizeEvent *);
+	virtual QSize sizeHint() const;
 protected slots:
 	void handleMarshalError(KviError::Code eError);
 	void connected();