chatline: highlightcolor is only loaded once in the init

userinputhandler: removed a qdebug, i forgot to remove

diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp
index 618bc8d..0ef5aba 100644 (file)
--- a/src/core/userinputhandler.cpp
+++ b/src/core/userinputhandler.cpp
@@ -92,7 +92,6 @@ void UserInputHandler::handleBan(const BufferInfo &bufferInfo, const QString &ms
   }
 
   QString banMsg = QString("MODE %1 +b %2").arg(banChannel).arg(banUser);
   }
 
   QString banMsg = QString("MODE %1 +b %2").arg(banChannel).arg(banUser);

-  qDebug() << banMsg;

   emit putRawLine(serverEncode(banMsg));
 }
 
   emit putRawLine(serverEncode(banMsg));
 }
 

diff --git a/src/qtui/chatline-old.cpp b/src/qtui/chatline-old.cpp
index c1cd7d2..2df6bbb 100644 (file)
--- a/src/qtui/chatline-old.cpp
+++ b/src/qtui/chatline-old.cpp
@@ -36,6 +36,9 @@ ChatLineOld::ChatLineOld(Message m) {
   selectionMode = None;
   isHighlight = false;
   formatMsg(msg);
   selectionMode = None;
   isHighlight = false;
   formatMsg(msg);

+
+  QtUiSettings s("QtUi/Colors");
+  _highlightColor = s.value("highlightColor", QVariant(QColor("lightcoral"))).value<QColor>();

 }
 
 ChatLineOld::~ChatLineOld() {
 }
 
 ChatLineOld::~ChatLineOld() {


@@ -318,10 +321,8 @@ void ChatLineOld::draw(QPainter *p, const QPointF &pos) {
     p->drawRect(QRectF(pos, QSizeF(tsWidth + QtUi::style()->sepTsSender() + senderWidth + QtUi::style()->sepSenderText() + textWidth, height())));
   } else {
     if(isHighlight) {
     p->drawRect(QRectF(pos, QSizeF(tsWidth + QtUi::style()->sepTsSender() + senderWidth + QtUi::style()->sepSenderText() + textWidth, height())));
   } else {
     if(isHighlight) {

-      QtUiSettings s("QtUi/Colors");
-      QColor highlightColor = s.value("highlightColor", QVariant(QColor("lightcoral"))).value<QColor>();

       p->setPen(Qt::NoPen);
       p->setPen(Qt::NoPen);

-      p->setBrush(highlightColor /*pal.brush(QPalette::AlternateBase) */);
+      p->setBrush(_highlightColor /*pal.brush(QPalette::AlternateBase) */);

       p->drawRect(QRectF(pos, QSizeF(tsWidth + QtUi::style()->sepTsSender() + senderWidth + QtUi::style()->sepSenderText() + textWidth, height())));
     }
     if(selectionMode == Partial) {
       p->drawRect(QRectF(pos, QSizeF(tsWidth + QtUi::style()->sepTsSender() + senderWidth + QtUi::style()->sepSenderText() + textWidth, height())));
     }
     if(selectionMode == Partial) {

diff --git a/src/qtui/chatline-old.h b/src/qtui/chatline-old.h
index 8d286b0..f4877a9 100644 (file)
--- a/src/qtui/chatline-old.h
+++ b/src/qtui/chatline-old.h
@@ -106,6 +106,8 @@ class ChatLineOld : public QObject, public AbstractUiMsg {
     void precomputeLine();
     QList<FormatRange> calcFormatRanges(const UiStyle::StyledText &);
     QList<FormatRange> calcFormatRanges(const UiStyle::StyledText &, const QTextLayout::FormatRange &additional);
     void precomputeLine();
     QList<FormatRange> calcFormatRanges(const UiStyle::StyledText &);
     QList<FormatRange> calcFormatRanges(const UiStyle::StyledText &, const QTextLayout::FormatRange &additional);

+
+    QColor _highlightColor;

 };
 
 #endif
 };
 
 #endif