Sanitize the handling of ColumnHandleItems

[quassel.git] / src / qtui / columnhandleitem.cpp

diff --git a/src/qtui/columnhandleitem.cpp b/src/qtui/columnhandleitem.cpp
index 3631168..7a93c4f 100644 (file)
--- a/src/qtui/columnhandleitem.cpp
+++ b/src/qtui/columnhandleitem.cpp
@@ -18,23 +18,23 @@
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
 
+#include "columnhandleitem.h"
+
+#include <QApplication>
 #include <QCursor>
 #include <QGraphicsScene>
 #include <QGraphicsSceneHoverEvent>
 #include <QPainter>
-
-#include <QDebug>
-
-#include "columnhandleitem.h"
+#include <QPalette>
 
 ColumnHandleItem::ColumnHandleItem(qreal w, QGraphicsItem *parent)
   : QGraphicsItem(parent),
     _width(w),
     _hover(0),
-    _timeLine(150),
     _moving(false),
     _minXPos(0),
-    _maxXPos(0)
+    _maxXPos(0),
+    _timeLine(150)
 {
   setAcceptsHoverEvents(true);
   setZValue(10);
@@ -44,7 +44,7 @@ ColumnHandleItem::ColumnHandleItem(qreal w, QGraphicsItem *parent)
 }
 
 void ColumnHandleItem::setXPos(qreal xpos) {
-  setPos(xpos - width()/2, 0);
+  setPos(xpos, 0);
 }
 
 void ColumnHandleItem::setXLimits(qreal min, qreal max) {
@@ -87,7 +87,7 @@ void ColumnHandleItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
   if(_moving) {
     _moving = false;
     setCursor(QCursor(Qt::OpenHandCursor));
-    emit positionChanged(x() + width()/2);
+    emit positionChanged(x());
     event->accept();
   } else {
     event->ignore();
@@ -118,11 +118,14 @@ void ColumnHandleItem::hoverChanged(qreal value) {
 void ColumnHandleItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) {
   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);
 }