fix for #552

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

4 files changed, 32 insertions, 1 deletions

diff --git a/src/modules/notifier/notifiermessage.cpp b/src/modules/notifier/notifiermessage.cpp
index 5074417d4..efe156dae 100644
--- a/src/modules/notifier/notifiermessage.cpp
+++ b/src/modules/notifier/notifiermessage.cpp
@@ -31,6 +31,8 @@
 #include "kvi_options.h"
 
 #include <QRect>
+#include <QResizeEvent>
+
 KviNotifierMessage::KviNotifierMessage(QPixmap * pPixmap, const QString &szText)
 {
 	m_szText=szText;
@@ -38,6 +40,7 @@ KviNotifierMessage::KviNotifierMessage(QPixmap * pPixmap, const QString &szText)
 
 	m_pLabel0 = new QLabel();
 	m_pLabel0->setFixedSize(16,16);
+
 	if(m_pPixmap)
 		m_pLabel0->setPixmap(*m_pPixmap);
 
@@ -62,6 +65,14 @@ KviNotifierMessage::~KviNotifierMessage()
 		m_pHBox->deleteLater();
 }
 
+#define LAB1_MARGIN 16+(3*SPACING)
+void KviNotifierMessage::resizeEvent(QResizeEvent * e)
+{
+	int iWidth=e->size().width()-LAB1_MARGIN;
+	if(iWidth>0)
+		m_pLabel1->setFixedWidth(iWidth);
+}
+
 //TODO merge this code with kvi_topicw.cpp's one
 #define KVI_LABEL_DEF_BACK 100
 #define KVI_LABEL_DEF_FORE 101
diff --git a/src/modules/notifier/notifiermessage.h b/src/modules/notifier/notifiermessage.h
index 897aafede..905b67ff9 100644
--- a/src/modules/notifier/notifiermessage.h
+++ b/src/modules/notifier/notifiermessage.h
@@ -48,7 +48,8 @@ public:
 	static QString convertToHtml(const QString &text);
 	inline QString text() const { return m_szText; };
 	inline QPixmap* pixmap() const { return m_pPixmap; };
-
+protected:
+	virtual void resizeEvent(QResizeEvent * e);
 };
 
 #endif //!_NOTIFIERMESSAGE_H_
diff --git a/src/modules/notifier/notifierwindowtab.cpp b/src/modules/notifier/notifierwindowtab.cpp
index d2727f88a..8c048a4b3 100644
--- a/src/modules/notifier/notifierwindowtab.cpp
+++ b/src/modules/notifier/notifierwindowtab.cpp
@@ -35,6 +35,7 @@
 #include "kvi_window.h"
 
 #include <QScrollBar>
+#include <QResizeEvent>
 
 extern KviNotifierWindow * g_pNotifierWindow;
 
@@ -86,6 +87,8 @@ KviNotifierWindowTab::~KviNotifierWindowTab()
 void KviNotifierWindowTab::appendMessage(KviNotifierMessage * m)
 {
 	m_pVBox->addWidget(m);
+	m->setFixedWidth(viewport()->width());
+
 	while(m_pVBox->count() > MAX_MESSAGES_IN_WINDOW)
 	{
 		QLayoutItem* tmp=m_pVBox->takeAt(0);
@@ -144,6 +147,21 @@ void KviNotifierWindowTab::closeMe()
 	}
 }
 
+void KviNotifierWindowTab::resizeEvent(QResizeEvent *)
+{
+	if(m_pVBox)
+	{
+		int iWidth = viewport()->width();
+		KviNotifierMessage* m;
+		for(int i=0;i<m_pVBox->count(); i++)
+		{
+			m = (KviNotifierMessage*)m_pVBox->itemAt(i)->widget();
+			if(m)
+				m->setFixedWidth(iWidth);
+		}
+	}
+}
+
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_notifierwindowtab.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/notifier/notifierwindowtab.h b/src/modules/notifier/notifierwindowtab.h
index 91191ed3f..bc64cc720 100644
--- a/src/modules/notifier/notifierwindowtab.h
+++ b/src/modules/notifier/notifierwindowtab.h
@@ -54,6 +54,7 @@ public:
 	inline KviWindow * wnd() const { return m_pWnd; };
 protected:
 	virtual void mouseDoubleClickEvent(QMouseEvent * e);
+	virtual void resizeEvent(QResizeEvent * e);
 private slots:
 	void scrollRangeChanged(int, int);
 	void labelChanged();