Merge pull request #502 from scribblemaniac/color-wheel-alpha-fix-2

Stopped color wheel changes from resetting alpha
pencil2d · May 22, 2016 · d2994bf · d2994bf
2 parents cfa0ac9 + 7b5ac71
commit d2994bf
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/app/colorwheel.cpp b/app/colorwheel.cpp
@@ -40,6 +40,11 @@ void ColorWheel::changeColor(const QColor &color)
     {
         svChanged(color);
     }
+
+    if(color.alpha() != m_currentColor.alpha())
+    {
+        alphaChanged(color.alpha());
+    }
     //emit colorChanged(color);
     update();
 }
@@ -61,6 +66,11 @@ void ColorWheel::setColor(const QColor &color)
         svChanged(color);
     }
 
+    if ( color.alpha() != m_currentColor.alpha() )
+    {
+        alphaChanged(color.alpha());
+    }
+
     update();
     emit colorSelected(color);
 }
@@ -360,8 +370,9 @@ void ColorWheel::hueChanged(const int &hue)
     }
     int s = m_currentColor.saturation();
     int v = m_currentColor.value();
+    int a = m_currentColor.alpha();
 
-    m_currentColor.setHsv(hue, s, v);
+    m_currentColor.setHsv(hue, s, v, a);
 
     if(!isVisible())
     {
@@ -377,9 +388,11 @@ void ColorWheel::hueChanged(const int &hue)
 void ColorWheel::svChanged(const QColor &newcolor)
 {
     int hue = m_currentColor.hue();
+    int alpha = m_currentColor.alpha();
     m_currentColor.setHsv(hue,
         newcolor.saturation(),
-        newcolor.value());
+        newcolor.value(),
+        alpha);
     if( !isVisible() )
     {
         return;
@@ -388,3 +401,15 @@ void ColorWheel::svChanged(const QColor &newcolor)
     repaint();
     emit colorChanged(m_currentColor);
 }
+
+void ColorWheel::alphaChanged(const int &alpha)
+{
+    m_currentColor.setAlpha(alpha);
+
+    if(!isVisible())
+    {
+        return;
+    }
+
+    emit colorChanged(m_currentColor);
+}
diff --git a/app/colorwheel.h b/app/colorwheel.h
@@ -33,6 +33,7 @@ public slots:
     void changeColor(const QColor &color);
     void hueChanged(const int &hue);
     void svChanged(const QColor &newcolor);
+    void alphaChanged(const int &alpha);
 
     QColor pickColor(const QPoint &point);