[Traverso-commit] traverso/src/traverso/songcanvas MarkerView.cpp...

[Ben Levitt]

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

Modified files:
        src/traverso/songcanvas: MarkerView.cpp MarkerView.h 
                                 TimeLineView.cpp 

Log message:
        when soft-selectiong markers, use distance from mouse to the markers' 
centers instead of to their left edges

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/MarkerView.cpp?cvsroot=traverso&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/MarkerView.h?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TimeLineView.cpp?cvsroot=traverso&r1=1.36&r2=1.37

Patches:
Index: MarkerView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/MarkerView.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- MarkerView.cpp      17 May 2007 09:58:05 -0000      1.16
+++ MarkerView.cpp      18 May 2007 22:30:42 -0000      1.17
@@ -114,6 +114,11 @@
        setPos( (long)(m_marker->get_when() / m_sv->scalefactor) - (m_width / 
2), 0);
 }
 
+int MarkerView::position()
+{
+       return (pos().x() + m_width / 2);
+}
+
 void MarkerView::set_position(int i)
 {
        setPos(i - m_width / 2, 0);

Index: MarkerView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/MarkerView.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- MarkerView.h        7 May 2007 18:14:38 -0000       1.8
+++ MarkerView.h        18 May 2007 22:30:42 -0000      1.9
@@ -41,6 +41,7 @@
        void calculate_bounding_rect();
        void load_theme_data();
        void set_active(bool);
+       int position();
        void set_position(int);
        void set_dragging(bool dragging);
        

Index: TimeLineView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TimeLineView.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- TimeLineView.cpp    17 May 2007 23:27:54 -0000      1.36
+++ TimeLineView.cpp    18 May 2007 22:30:42 -0000      1.37
@@ -385,15 +385,16 @@
                return;
        }
        
-       foreach(MarkerView* markerView, m_markerViews) {
-               
-               QPoint nodePos((int)markerView->pos().x(), 
(int)markerView->pos().y());
+       int x = pos.x();
+       int blinkMarkerDist = abs(x - m_blinkingMarker->position());
                
-               int markerDist = (pos - nodePos).manhattanLength();
-               int blinkNodeDist = (pos - QPoint((int)m_blinkingMarker->x(), 
(int)m_blinkingMarker->y())).manhattanLength();
+       foreach(MarkerView* markerView, m_markerViews) {
+               int markerDist = abs(x - markerView->position());
                
-               if (markerDist < blinkNodeDist) {
+               fflush(stdout);
+               if (markerDist < blinkMarkerDist) {
                        m_blinkingMarker = markerView;
+                       blinkMarkerDist = abs(x - m_blinkingMarker->position());
                }
        }