From: werner s. <wsc...@us...> - 2006-01-10 15:43:14
|
Update of /cvsroot/lmuse/muse/awl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6366/awl Modified Files: tcanvas.cpp tcanvas.h Log Message: misc updates Index: tcanvas.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/awl/tcanvas.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** tcanvas.cpp 8 Jan 2006 23:44:54 -0000 1.44 --- tcanvas.cpp 10 Jan 2006 15:43:02 -0000 1.45 *************** *** 27,30 **** --- 27,37 ---- QPixmap* TimeCanvas::mk4; + enum DragType { + DRAG_RULER, + DRAG_CANVASA, DRAG_CANVAS_B, + DRAG_PANELA, DRAG_PANELB, + DRAG_OTHER + }; + //--------------------------------------------------------- // TimeCanvas *************** *** 190,193 **** --- 197,201 ---- if (rRuler.contains(p)) { + dragType = DRAG_RULER; if (shift) { if (button == Qt::LeftButton) *************** *** 198,201 **** --- 206,210 ---- } else { + dragType = DRAG_OTHER; mousePress(me); } *************** *** 211,214 **** --- 220,224 ---- AL::Pos pos(pix2pos(p.x()-rCanvasA.x())); + if (dragType == DRAG_OTHER) { if (button == 0 && (rPanelB.contains(p) || rCanvasB.contains(p))) { if (!mouseInB) { *************** *** 250,254 **** emit addMarker(i); emit posChanged(i, pos); - return true; } else { --- 260,263 ---- *************** *** 256,259 **** --- 265,282 ---- } } + else if (dragType == DRAG_RULER) { + int b = me->buttons(); + if (b == 0) + return true; + int i = 0; + if (b & Qt::MidButton) + i = 1; + else if (b & Qt::RightButton) + i = 2; + if (keyState & Qt::ShiftModifier) + emit addMarker(i); + emit posChanged(i, pos); + } + } return true; Index: tcanvas.h =================================================================== RCS file: /cvsroot/lmuse/muse/awl/tcanvas.h,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** tcanvas.h 8 Jan 2006 19:38:13 -0000 1.33 --- tcanvas.h 10 Jan 2006 15:43:02 -0000 1.34 *************** *** 70,73 **** --- 70,74 ---- QGridLayout* grid; QBrush _canvasBg; + int dragType; // |