X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=8d830b6f01acae3ba655ecf6159b0678e08bde3d;hp=bcf3c93513093f90ff29578780dfc96bede98039;hb=0bf59432571f1f8a6af2b3fcf29066cfff4cef57;hpb=206ce9444661cc7b2f65bdd8c8c0d1c365e6306f

diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp
index bcf3c935..8d830b6f 100644
--- a/src/qtui/chatscene.cpp
+++ b/src/qtui/chatscene.cpp
@@ -27,8 +27,15 @@
 #include "chatscene.h"
 #include "columnhandleitem.h"
 #include "qtui.h"
+#include "qtuisettings.h"
 
-ChatScene::ChatScene(QAbstractItemModel *model, QObject *parent) : QGraphicsScene(parent), _model(model) {
+const qreal minContentsWidth = 200;
+
+ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, QObject *parent)
+  : QGraphicsScene(parent),
+  _idString(idString),
+  _model(model)
+{
   _width = 0;
   connect(this, SIGNAL(sceneRectChanged(const QRectF &)), this, SLOT(rectChanged(const QRectF &)));
 
@@ -39,14 +46,25 @@ ChatScene::ChatScene(QAbstractItemModel *model, QObject *parent) : QGraphicsScen
     addItem(line);
   }
 
-  firstColHandlePos = 80;
-  secondColHandlePos = 200;
+  QtUiSettings s;
+  int defaultFirstColHandlePos = s.value("ChatView/DefaultFirstColumnHandlePos", 80).toInt();
+  int defaultSecondColHandlePos = s.value("ChatView/DefaultSecondColumnHandlePos", 200).toInt();
+
+  firstColHandlePos = s.value(QString("ChatView/%1/FirstColumnHandlePos").arg(_idString),
+                               defaultFirstColHandlePos).toInt();
+  secondColHandlePos = s.value(QString("ChatView/%1/SecondColumnHandlePos").arg(_idString),
+                                defaultSecondColHandlePos).toInt();
 
   firstColHandle = new ColumnHandleItem(QtUi::style()->firstColumnSeparator()); addItem(firstColHandle);
   secondColHandle = new ColumnHandleItem(QtUi::style()->secondColumnSeparator()); addItem(secondColHandle);
 
+  connect(firstColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(handlePositionChanged(qreal)));
+  connect(secondColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(handlePositionChanged(qreal)));
+
   firstColHandle->setXPos(firstColHandlePos);
+  firstColHandle->setXLimits(0, secondColHandlePos);
   secondColHandle->setXPos(secondColHandlePos);
+  secondColHandle->setXLimits(firstColHandlePos, width() - minContentsWidth);
 
   emit heightChanged(height());
 }
@@ -91,6 +109,7 @@ void ChatScene::setWidth(qreal w) {
     _height += line->setGeometry(_width, firstColHandlePos, secondColHandlePos);
   }
   setSceneRect(QRectF(0, 0, w, _height));
+  secondColHandle->setXLimits(firstColHandlePos, width() - minContentsWidth);
   emit heightChanged(_height);
 }
 
@@ -98,3 +117,25 @@ void ChatScene::rectChanged(const QRectF &rect) {
   firstColHandle->sceneRectChanged(rect);
   secondColHandle->sceneRectChanged(rect);
 }
+
+void ChatScene::handlePositionChanged(qreal xpos) {
+  bool first = (sender() == firstColHandle);
+  qreal oldx;
+  if(first) {
+    oldx = firstColHandlePos;
+    firstColHandlePos = xpos;
+  } else {
+    oldx = secondColHandlePos;
+    secondColHandlePos = xpos;
+  }
+  QtUiSettings s;
+  s.setValue(QString("ChatView/%1/FirstColumnHandlePos").arg(_idString), firstColHandlePos);
+  s.setValue(QString("ChatView/%1/SecondColumnHandlePos").arg(_idString), secondColHandlePos);
+  s.setValue(QString("ChatView/DefaultFirstColumnHandlePos"), firstColHandlePos);
+  s.setValue(QString("ChatView/DefaultSecondColumnHandlePos"), secondColHandlePos);
+
+  setWidth(width());  // readjust all chatlines
+  // we get ugly redraw errors if we don't update this explicitly... :(
+  // width() should be the same for both handles, so just use firstColHandle regardless
+  update(qMin(oldx, xpos) - firstColHandle->width()/2, 0, qMax(oldx, xpos) + firstColHandle->width()/2, height());
+}