disbaled the ability to collapse the ircview and the userlist using the splitter (it creates confusion with the hide/show userlist function)

ensure the ircview has a minimum size greater than the width of a KVI_TEXT_ICON (to avoid an infinite loop in calculateLineWraps())

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

5 files changed, 11 insertions, 2 deletions

diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index 920a92711..771f0b0d0 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -132,6 +132,8 @@ KviChannel::KviChannel(KviFrame * lpFrm, KviConsole * lpConsole, const QString &
 	// Central splitter
 	m_pSplitter = new KviTalSplitter(Qt::Horizontal,this);
 	m_pSplitter->setObjectName(szName);
+	m_pSplitter->setChildrenCollapsible(false);
+	
 	// Spitted vertially on the left
 	m_pVertSplitter = new KviTalSplitter(Qt::Vertical,m_pSplitter);
 	// With the IRC view over
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
index f00a09d9f..13bcba83a 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/kvi_console.cpp
@@ -129,6 +129,8 @@ KviConsole::KviConsole(KviFrame * lpFrm,int iFlags)
 
 	m_pSplitter = new KviTalSplitter(Qt::Horizontal,this);
 	m_pSplitter->setObjectName("console_splitter");
+	m_pSplitter->setChildrenCollapsible(false);
+
 	m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this);
 	connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked()));
 
diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
index 89c205ca1..c4f26a0b7 100644
--- a/src/kvirc/ui/kvi_ircview.cpp
+++ b/src/kvirc/ui/kvi_ircview.cpp
@@ -325,7 +325,7 @@ KviIrcView::KviIrcView(QWidget *parent,KviFrame *pFrm,KviWindow *pWnd)
 	m_iLastScrollBarValue      = 0;
 
 	// set the minimum width
-	setMinimumWidth(KVI_IRCVIEW_MINIMUM_WIDTH);
+	setMinimumWidth(KVI_IRCVIEW_MINIMUM_WIDTH + m_pScrollBar->sizeHint().width());
 	// and catch all mouse events
 	setMouseTracking(true);
 	// let's go!
@@ -1647,6 +1647,7 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth)
 			{
 				if(ptr->pChunks[curAttrBlock].type == KVI_TEXT_ICON)
 				{
+					//FIXME what if the icon curBlockWidth is > maxWidth ? => endless loop
 					// This is an icon block: needs to be wrapped differently:
 					// The wrap block goes BEFORE the icon itself
 					ptr->pBlocks[ptr->iBlockCount].pChunk  = 0;
diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
index 993a4bd83..90d9d664d 100644
--- a/src/kvirc/ui/kvi_query.cpp
+++ b/src/kvirc/ui/kvi_query.cpp
@@ -84,7 +84,9 @@ KviQuery::KviQuery(KviFrame * lpFrm, KviConsole * lpConsole, const QString & szN
 	createTextEncodingButton(m_pButtonGrid);
 
 	m_pSplitter = new KviTalSplitter(Qt::Horizontal,this);
-	m_pSplitter->setObjectName("main_splitter");
+	m_pSplitter->setObjectName("query_splitter");
+	m_pSplitter->setChildrenCollapsible(false);
+
 	m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this);
 	connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked()));
 	//m_pEditorsContainer= new KviToolWindowsContainer(m_pSplitter);
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 784d36dfe..02e897a04 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -102,6 +102,8 @@ KviDccChat::KviDccChat(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name)
 
 	m_pSplitter = new KviTalSplitter(Qt::Horizontal,this);
 	m_pSplitter->setObjectName("dcc_chat_splitter");
+	m_pSplitter->setChildrenCollapsible(false);
+
 	m_pIrcView  = new KviIrcView(m_pSplitter,pFrm,this);
 	connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked()));
 	m_pInput    = new KviInput(this);