X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fcolumnhandleitem.cpp;h=bfe6ee5fbe44f80edb5f9da486364ace65359381;hp=7d382c1b47ad16de2233adea612bd8d36175dbc2;hb=62192fb6cd9cc211b5b9fe844c9b4c2f98f923cc;hpb=d6111192cd2aad81a2f31497ff5ba51147fb5319

diff --git a/src/qtui/columnhandleitem.cpp b/src/qtui/columnhandleitem.cpp
index 7d382c1b..bfe6ee5f 100644
--- a/src/qtui/columnhandleitem.cpp
+++ b/src/qtui/columnhandleitem.cpp
@@ -18,21 +18,26 @@
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
 
+#include "columnhandleitem.h"
+
+#include <QApplication>
 #include <QCursor>
 #include <QGraphicsScene>
 #include <QGraphicsSceneHoverEvent>
 #include <QPainter>
+#include <QPalette>
 
-#include "columnhandleitem.h"
+#include <QDebug>
 
 ColumnHandleItem::ColumnHandleItem(qreal w, QGraphicsItem *parent)
   : QGraphicsItem(parent),
     _width(w),
+    _boundingRect(-_width/2, 0, _width, 0),
     _hover(0),
     _moving(false),
-    _timeLine(150),
     _minXPos(0),
-    _maxXPos(0)
+    _maxXPos(0),
+    _timeLine(150)
 {
   setAcceptsHoverEvents(true);
   setZValue(10);
@@ -42,7 +47,10 @@ ColumnHandleItem::ColumnHandleItem(qreal w, QGraphicsItem *parent)
 }
 
 void ColumnHandleItem::setXPos(qreal xpos) {
-  setPos(xpos - width()/2, 0);
+  setPos(xpos, 0);
+  QRectF sceneBRect = _boundingRect.translated(x(), 0);
+  _sceneLeft = sceneBRect.left();
+  _sceneRight = sceneBRect.right();
 }
 
 void ColumnHandleItem::setXLimits(qreal min, qreal max) {
@@ -53,8 +61,8 @@ void ColumnHandleItem::setXLimits(qreal min, qreal max) {
 }
 
 void ColumnHandleItem::sceneRectChanged(const QRectF &rect) {
-  if(rect.height() != boundingRect().height())
-    prepareGeometryChange();
+  prepareGeometryChange();
+  _boundingRect = QRectF(-_width/2, rect.y(), _width, rect.height());
 }
 
 void ColumnHandleItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
@@ -85,7 +93,10 @@ void ColumnHandleItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
   if(_moving) {
     _moving = false;
     setCursor(QCursor(Qt::OpenHandCursor));
-    emit positionChanged(x() + width()/2);
+    QRectF sceneBRect = _boundingRect.translated(x(), 0);
+    _sceneLeft = sceneBRect.left();
+    _sceneRight = sceneBRect.right();
+    emit positionChanged(x());
     event->accept();
   } else {
     event->ignore();
@@ -117,10 +128,13 @@ void ColumnHandleItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *
   Q_UNUSED(option);
   Q_UNUSED(widget);
 
-  QLinearGradient gradient(0, 0, width(), 0);
-  gradient.setColorAt(0.25, Qt::transparent);
-  gradient.setColorAt(0.5, QColor(0, 0, 0, _hover * 200));
-  gradient.setColorAt(0.75, Qt::transparent);
+  QLinearGradient gradient(boundingRect().topLeft(), boundingRect().topRight());
+  QColor rulerColor = QApplication::palette().windowText().color();
+  rulerColor.setAlphaF(_hover);
+  gradient.setColorAt(0, Qt::transparent);
+  gradient.setColorAt(0.4, rulerColor);
+  gradient.setColorAt(0.6, rulerColor);
+  gradient.setColorAt(1, Qt::transparent);
   painter->fillRect(boundingRect(), gradient);
 }