[Traverso-commit] traverso resources/themes/default/traversotheme...

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/06/05 22:51:30

Modified files:
        resources/themes/default: traversotheme.xml 
        src/traverso/songcanvas: CurveView.cpp CurveView.h 

Log message:
        improve CurveNode blink color and smoothness

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/themes/default/traversotheme.xml?cvsroot=traverso&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/CurveView.cpp?cvsroot=traverso&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/CurveView.h?cvsroot=traverso&r1=1.10&r2=1.11

Patches:
Index: resources/themes/default/traversotheme.xml
===================================================================
RCS file: 
/sources/traverso/traverso/resources/themes/default/traversotheme.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- resources/themes/default/traversotheme.xml  30 May 2007 20:44:29 -0000      
1.35
+++ resources/themes/default/traversotheme.xml  5 Jun 2007 22:51:29 -0000       
1.36
@@ -81,7 +81,7 @@
                <color name="Curve:inactive" red="255" green="0" blue="255" 
alpha="150" />
                
                <color name="CurveNode:default" red="255" green="0" blue="255" 
alpha="140" />
-               <color name="CurveNode:blink" red="170" green="255" blue="170" 
alpha="220" />
+               <color name="CurveNode:blink" red="120" green="120" blue="220" 
alpha="220" />
                
                <color name="Fade:default" red="255" green="0" blue="255" 
alpha="85" />
                <color name="Fade:bypassed" red="255" green="0" blue="255" 
alpha="40" />

Index: src/traverso/songcanvas/CurveView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/CurveView.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- src/traverso/songcanvas/CurveView.cpp       31 May 2007 05:47:45 -0000      
1.54
+++ src/traverso/songcanvas/CurveView.cpp       5 Jun 2007 22:51:29 -0000       
1.55
@@ -291,7 +291,7 @@
        
        if (xstart <= 80) {
                
painter->setFont(themer()->get_font("CurveView:fontscale:label"));
-               painter->drawText(10, m_boundingRect.height() - 14, "Gain 
Curve");
+               painter->drawText(10, (int)(m_boundingRect.height() - 14), 
"Gain Curve");
        }
        
        painter->restore();
@@ -353,7 +353,6 @@
 {
        Q_UNUSED(event);
        
-       m_blinkColor = themer()->get_color("CurveNode:blink");
        m_blinkTimer.start(40);
 }
 
@@ -414,7 +413,6 @@
                
                if (nodeDist < blinkNodeDist) {
                        m_blinkingNode = nodeView;
-                       m_blinkColor = themer()->get_color("CurveNode:blink");
                }
        }
 
@@ -432,6 +430,7 @@
        }
        if (!prevNode && m_blinkingNode) {
                m_blinkingNode->set_selected();
+               m_blinkDarkness = 100;
        }
 }
 
@@ -442,24 +441,19 @@
                return;
        }
        
-       int red = m_blinkColor.red();
-       int blue = m_blinkColor.blue();
+       m_blinkDarkness += (6 * m_blinkColorDirection);
        
-       red += (15 * m_blinkColorDirection);
-       blue += (15 * m_blinkColorDirection);
-       
-       if (red > 255 || blue > 255) {
+       if (m_blinkDarkness >= 100) {
                m_blinkColorDirection *= -1;
-               red = 255;
-               blue = 255;
-       } else if (red < 130) {
+               m_blinkDarkness = 100;
+       } else if (m_blinkDarkness <= 40) {
                m_blinkColorDirection *= -1;
+               m_blinkDarkness = 40;
        }
        
-       m_blinkColor.setRed(red);
-       m_blinkColor.setBlue(blue);
+       QColor blinkColor = themer()->get_color("CurveNode:blink");
        
-       m_blinkingNode->set_color(m_blinkColor);
+       m_blinkingNode->set_color(blinkColor.light(m_blinkDarkness));
        
        m_blinkingNode->update();
 }

Index: src/traverso/songcanvas/CurveView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/CurveView.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/traverso/songcanvas/CurveView.h 30 May 2007 06:31:57 -0000      1.10
+++ src/traverso/songcanvas/CurveView.h 5 Jun 2007 22:51:29 -0000       1.11
@@ -64,7 +64,7 @@
        Curve*          m_guicurve;
        QTimer          m_blinkTimer;
        CurveNodeView*  m_blinkingNode;
-       QColor          m_blinkColor;
+       int             m_blinkDarkness;
        int             m_blinkColorDirection;
        QList<CurveNodeView*>   m_nodeViews;
        nframes_t       m_startoffset;