[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krita/krita-testing-wolthera] libs/ui/widgets: Make mouse press event select a color too.
From:       Wolthera van Hovell tot Westerflier <griffinvalley () gmail ! com>
Date:       2016-08-23 14:22:27
Message-ID: E1bcCax-0002U9-RD () code ! kde ! org
[Download RAW message or body]

Git commit 12799acad033e3825399af81341dcc78f531907e by Wolthera van Hovell tot \
Westerflier. Committed on 23/08/2016 at 12:44.
Pushed by woltherav into branch 'krita-testing-wolthera'.

Make mouse press event select a color too.

Also speed up the timers a little bit.

M  +7    -2    libs/ui/widgets/kis_visual_color_selector.cpp

http://commits.kde.org/krita/12799acad033e3825399af81341dcc78f531907e

diff --git a/libs/ui/widgets/kis_visual_color_selector.cpp \
b/libs/ui/widgets/kis_visual_color_selector.cpp index 93b06d4..719039b 100644
--- a/libs/ui/widgets/kis_visual_color_selector.cpp
+++ b/libs/ui/widgets/kis_visual_color_selector.cpp
@@ -227,8 +227,8 @@ KisVisualColorSelectorShape::KisVisualColorSelectorShape(QWidget \
*parent,  m_d->channel1 = qBound(0, channel1, maxchannel);
     m_d->channel2 = qBound(0, channel2, maxchannel);
     this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    m_d->updateTimer = new KisSignalCompressor(100 /* ms */, \
                KisSignalCompressor::POSTPONE, this);
-    m_d->siblingTimer = new KisSignalCompressor(100 /* ms */, \
KisSignalCompressor::POSTPONE, this); +    m_d->updateTimer = new \
KisSignalCompressor(30 /* ms */, KisSignalCompressor::POSTPONE, this); +    \
m_d->siblingTimer = new KisSignalCompressor(30 /* ms */, \
KisSignalCompressor::POSTPONE, this);  setDisplayRenderer(displayRenderer);
     show();
 
@@ -556,6 +556,11 @@ QVector<qreal> \
KisVisualColorSelectorShape::convertvectorfloatToqreal(QVector <f  void \
KisVisualColorSelectorShape::mousePressEvent(QMouseEvent *e)  {
     m_d->mousePressActive = true;
+    QPointF coordinates = convertWidgetCoordinateToShapeCoordinate(e->pos());
+    KoColor col = convertShapeCoordinateToKoColor(coordinates);
+    setColor(col);
+    Q_EMIT sigNewColor(col);
+    m_d->updateTimer->start();
 }
 
 void KisVisualColorSelectorShape::mouseMoveEvent(QMouseEvent *e)


[prev in list] [next in list] [prev in thread] [next in thread]