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

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/04/26 17:24:34

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

Log message:
        * robuster node 'growing' and 'shrinking' when soft selecting a node, 
        also configurable now by theme file

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/themes/default/traversotheme.xml?cvsroot=traverso&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/CurveNodeView.cpp?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/CurveNodeView.h?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/CurveView.cpp?cvsroot=traverso&r1=1.42&r2=1.43

Patches:
Index: resources/themes/default/traversotheme.xml
===================================================================
RCS file: 
/sources/traverso/traverso/resources/themes/default/traversotheme.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- resources/themes/default/traversotheme.xml  25 Apr 2007 18:53:26 -0000      
1.20
+++ resources/themes/default/traversotheme.xml  26 Apr 2007 17:24:34 -0000      
1.21
@@ -8,6 +8,7 @@
                <property name="AudioClip:wavemicroview:antialiased" value="0" 
/>
                <property name="AudioClip:fillwave" value="1" />
                
+               <property name="CurveNode:diameter" value="6" />
                
                <property name="Song:track:seperatingheight" value="0" />
                <property name="Song:track:minimumheight" value="16" />

Index: src/traverso/songcanvas/CurveNodeView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/CurveNodeView.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/traverso/songcanvas/CurveNodeView.cpp   26 Apr 2007 13:46:42 -0000      
1.8
+++ src/traverso/songcanvas/CurveNodeView.cpp   26 Apr 2007 17:24:34 -0000      
1.9
@@ -39,7 +39,8 @@
        PENTERCONS;
        m_sv = sv;
        m_curveview = curveview;
-       m_boundingRect = QRectF(0, 0, 6, 6);
+       int size = themer()->get_property("CurveNode:diameter", 6).toInt();
+       m_boundingRect = QRectF(0, 0, size, size);
        load_theme_data();
        
        connect(m_node->m_curve, SIGNAL(nodePositionChanged()), this, 
SLOT(update_pos()));
@@ -111,17 +112,19 @@
        set_when_and_value((m_node->get_when() / m_sv->scalefactor), 
m_node->get_value());
 }
 
-void CurveNodeView::increase_size( )
+void CurveNodeView::set_selected( )
 {
-       m_boundingRect.setWidth(m_boundingRect.width() + 1);
-       m_boundingRect.setHeight(m_boundingRect.height() + 1);
+       int size = themer()->get_property("CurveNode:diameter", 6).toInt();
+       m_boundingRect.setWidth(size + 1);
+       m_boundingRect.setHeight(size + 1);
        update_pos();
 }
 
-void CurveNodeView::decrease_size( )
+void CurveNodeView::reset_size( )
 {
-       m_boundingRect.setWidth(m_boundingRect.width() - 1);
-       m_boundingRect.setHeight(m_boundingRect.height() - 1);
+       int size = themer()->get_property("CurveNode:diameter", 6).toInt();
+       m_boundingRect.setWidth(size);
+       m_boundingRect.setHeight(size);
        update_pos();
 }
 

Index: src/traverso/songcanvas/CurveNodeView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/CurveNodeView.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/traverso/songcanvas/CurveNodeView.h     26 Apr 2007 13:46:42 -0000      
1.6
+++ src/traverso/songcanvas/CurveNodeView.h     26 Apr 2007 17:24:34 -0000      
1.7
@@ -41,8 +41,8 @@
        void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, 
QWidget *widget);
        int type() const;
        void calculate_bounding_rect();
-       void increase_size();
-       void decrease_size();
+       void set_selected();
+       void reset_size();
        
        void set_color(QColor color);
        void load_theme_data();

Index: src/traverso/songcanvas/CurveView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/CurveView.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- src/traverso/songcanvas/CurveView.cpp       26 Apr 2007 16:53:42 -0000      
1.42
+++ src/traverso/songcanvas/CurveView.cpp       26 Apr 2007 17:24:34 -0000      
1.43
@@ -360,7 +360,7 @@
        m_blinkTimer.stop();
        if (m_blinkingNode) {
                
m_blinkingNode->set_color(themer()->get_color("CurveNode:default"));
-               m_blinkingNode->decrease_size();
+               m_blinkingNode->reset_size();
                m_blinkingNode = 0;
        }
 }
@@ -416,13 +416,13 @@
        if (prevNode && (prevNode != m_blinkingNode) ) {
                prevNode->set_color(themer()->get_color("CurveNode:default"));
                prevNode->update();
-               prevNode->decrease_size();
+               prevNode->reset_size();
                if (m_blinkingNode) {
-                       m_blinkingNode->increase_size();
+                       m_blinkingNode->set_selected();
                }
        }
        if (!prevNode && m_blinkingNode) {
-               m_blinkingNode->increase_size();
+               m_blinkingNode->set_selected();
        }
 }