[Lmuse-cvs-traffic] muse/awl tcanvas.cpp,1.41,1.42 tcanvas.h,1.31,1.32

[werner s. <wsc...@us...>]

Update of /cvsroot/lmuse/muse/awl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19855/awl

Modified Files:
	tcanvas.cpp tcanvas.h 
Log Message:
drumeditor fixes


Index: tcanvas.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/awl/tcanvas.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** tcanvas.cpp	7 Jan 2006 12:31:26 -0000	1.41
--- tcanvas.cpp	8 Jan 2006 14:07:48 -0000	1.42
***************
*** 169,172 ****
--- 169,182 ----
                    return false;
  
+             case QEvent::MouseButtonDblClick:
+                   {
+                   QMouseEvent* me = (QMouseEvent*)event;
+                   QPoint p(me->pos());
+                   button   = me->button();
+                   keyState = me->modifiers();
+                   mouseDoubleClick(me);
+                   }
+                   return true;
+ 
              case QEvent::MouseButtonPress:
                    {
***************
*** 257,270 ****
                    return true;
  
-             case QEvent::MouseButtonDblClick:
-                   {
-                   QMouseEvent* me = (QMouseEvent*)event;
-                   QPoint p(me->pos());
-                   button   = me->button();
-                   keyState = me->modifiers();
-                   mouseDoubleClick(QPoint(p.x() - rPanelA.width(), p.y() - rulerHeight));
-                   }
-                   return true;
- 
              case QEvent::DragEnter:
                    dragEnter((QDragEnterEvent*)event);
--- 267,270 ----

Index: tcanvas.h
===================================================================
RCS file: /cvsroot/lmuse/muse/awl/tcanvas.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** tcanvas.h	7 Jan 2006 12:31:26 -0000	1.31
--- tcanvas.h	8 Jan 2006 14:07:48 -0000	1.32
***************
*** 122,126 ****
        virtual void mouseMove(QPoint)  {}
        virtual void mouseRelease(QMouseEvent*) {}
!       virtual void mouseDoubleClick(QPoint) {}
        virtual void pianoPressed(int /*pitch*/, int /*velocity*/, bool /*shift*/) {}
        virtual void pianoReleased(int /*pitch*/, bool) {}
--- 122,126 ----
        virtual void mouseMove(QPoint)  {}
        virtual void mouseRelease(QMouseEvent*) {}
!       virtual void mouseDoubleClick(QMouseEvent*) {}
        virtual void pianoPressed(int /*pitch*/, int /*velocity*/, bool /*shift*/) {}
        virtual void pianoReleased(int /*pitch*/, bool) {}
***************
*** 165,170 ****
              }
  
!       int y2pitch(int y) const;
!       int pitch2y(int pitch) const;
  
     private slots:
--- 165,170 ----
              }
  
!       virtual int y2pitch(int y) const;
!       virtual int pitch2y(int pitch) const;
  
     private slots:
***************
*** 221,224 ****
--- 221,226 ----
        void setCanvasBackground(const QPixmap& pm);
  
+       void updateCanvasB() { _widget->update(rCanvasB); }
+ 
        static FollowMode followMode;
        friend class CtrlEdit;