X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=b7355fd163285ed9488d89509e0c521b12210051;hp=488a91d6642a0ce04ec9cfa6fd6587fb7fec8e87;hb=15c352c7ae1ea3d0884d8dc641b7d642a51179fd;hpb=c5c74323b6d8f3fc6775ca1d08cb84c602bac58d

diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp
index 488a91d6..b7355fd1 100644
--- a/src/qtui/chatscene.cpp
+++ b/src/qtui/chatscene.cpp
@@ -59,7 +59,7 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, QObject
 	  this, SLOT(rowsInserted(const QModelIndex &, int, int)));
   connect(model, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)),
 	  this, SLOT(rowsAboutToBeRemoved(const QModelIndex &, int, int)));
-  
+
   for(int i = 0; i < model->rowCount(); i++) {
     ChatLine *line = new ChatLine(i, model);
     _lines.append(line);
@@ -85,9 +85,8 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, QObject
   connect(secondColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(handlePositionChanged(qreal)));
 
   firstColHandle->setXPos(firstColHandlePos);
-  firstColHandle->setXLimits(0, secondColHandlePos);
   secondColHandle->setXPos(secondColHandlePos);
-  secondColHandle->setXLimits(firstColHandlePos, width() - minContentsWidth);
+  setHandleXLimits();
 
   emit heightChanged(height());
 }
@@ -191,7 +190,7 @@ void ChatScene::setWidth(qreal w) {
     _height += line->setGeometry(_width, firstColHandlePos, secondColHandlePos);
   }
   setSceneRect(QRectF(0, 0, w, _height));
-  secondColHandle->setXLimits(firstColHandlePos, width() - minContentsWidth);
+  setHandleXLimits();
   emit heightChanged(_height);
 }
 
@@ -219,7 +218,14 @@ void ChatScene::handlePositionChanged(qreal xpos) {
   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());
+  update(qMin(oldx, xpos), 0, qMax(oldx, xpos) + firstColHandle->width(), height());
+}
+
+void ChatScene::setHandleXLimits() {
+  qreal firstsepwidth = QtUi::style()->firstColumnSeparator();
+  qreal secondsepwidth = QtUi::style()->secondColumnSeparator();
+  firstColHandle->setXLimits(-firstsepwidth/2, secondColHandlePos - firstsepwidth/2);
+  secondColHandle->setXLimits(firstColHandlePos + firstsepwidth - secondsepwidth/2, width() - minContentsWidth - secondsepwidth/2);
 }
 
 void ChatScene::setSelectingItem(ChatItem *item) {
@@ -238,7 +244,7 @@ void ChatScene::startGlobalSelection(ChatItem *item, const QPointF &itemPos) {
 void ChatScene::updateSelection(const QPointF &pos) {
   // This is somewhat hacky... we look at the contents item that is at the cursor's y position (ignoring x), since
   // it has the full height. From this item, we can then determine the row index and hence the ChatLine.
-  ChatItem *contentItem = static_cast<ChatItem *>(itemAt(QPointF(secondColHandlePos + secondColHandle->width()/2, pos.y())));
+  ChatItem *contentItem = static_cast<ChatItem *>(itemAt(QPointF(secondColHandlePos + secondColHandle->width(), pos.y())));
   if(!contentItem) return;
 
   int curRow = contentItem->row();
@@ -278,10 +284,12 @@ void ChatScene::updateSelection(const QPointF &pos) {
   _lastSelectionRow = curRow;
 
   if(newstart == newend && minColumn == ChatLineModel::ContentsColumn) {
+    if(!_selectingItem) {
+      qWarning() << "WARNING: ChatScene::updateSelection() has a null _selectingItem, this should never happen! Please report.";
+      return;
+    }
     _lines[curRow]->setSelected(false);
     _isSelecting = false;
-    Q_ASSERT(_selectingItem); // this seems to not always be true, but I have no idea why
-                              // adding this assert to make sure the occasional segfault is caused by this
     _selectingItem->continueSelecting(_selectingItem->mapFromScene(pos));
   }
 }
@@ -361,9 +369,9 @@ void ChatScene::requestBacklog() {
 }
 
 int ChatScene::sectionByScenePos(int x) {
-  if(x < firstColHandlePos)
+  if(x < firstColHandlePos + firstColHandle->width()/2)
     return ChatLineModel::TimestampColumn;
-  if(x < secondColHandlePos)
+  if(x < secondColHandlePos + secondColHandle->width()/2)
     return ChatLineModel::SenderColumn;
 
   return ChatLineModel::ContentsColumn;