summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Schweer <ws.seh.de>2006-12-01 13:41:57 +0000
committerWerner Schweer <ws.seh.de>2006-12-01 13:41:57 +0000
commit347f5ed76609602d82fac125ac35a7da2f79d47c (patch)
tree5fe776df2b37fa1138cbeeb68ae89772cf9f2e75
parentdeb38538f32489caa57081c097a18e691f81cbfe (diff)
updates
-rw-r--r--muse/awl/tcanvas.cpp8
-rw-r--r--muse/awl/tcanvas.h1
2 files changed, 8 insertions, 1 deletions
diff --git a/muse/awl/tcanvas.cpp b/muse/awl/tcanvas.cpp
index 4b6b587f..9ded1a2a 100644
--- a/muse/awl/tcanvas.cpp
+++ b/muse/awl/tcanvas.cpp
@@ -420,7 +420,8 @@ void TimeCanvas::moveX(int x)
int wh = _widget->height();
- if (type == TIME_CANVAS_PIANOROLL || type == TIME_CANVAS_DRUMEDIT) {
+ if (type == TIME_CANVAS_PIANOROLL || type == TIME_CANVAS_DRUMEDIT
+ || TIME_CANVAS_WAVEEDIT) {
_widget->scroll(dx, 0, QRect(rCanvasA.x(), 0, rCanvasA.width(), wh));
//HACK:
@@ -798,6 +799,9 @@ void TimeCanvas::canvasPaintEvent(const QRect& r, QPainter& p)
else if (type == TIME_CANVAS_PIANOROLL) {
paintPiano(p, par);
}
+ else if (type == TIME_CANVAS_WAVEEDIT) {
+ p.fillRect(par, QColor(0xe0, 0xe0, 0xe0));
+ }
}
QRect pbr(r & rPanelB);
@@ -1668,6 +1672,8 @@ void TimeCanvas::updateGeometry()
x1 = pianoWidth;
else if (type == TIME_CANVAS_DRUMEDIT)
x1 = drumWidth;
+ else if (type == TIME_CANVAS_WAVEEDIT)
+ x1 = waveWidth;
int y2 = wh - ctrlHeight;
rPanelA.setRect(0, rulerHeight, x1, wh - rulerHeight - ctrlHeight);
diff --git a/muse/awl/tcanvas.h b/muse/awl/tcanvas.h
index a2955a07..a00e387b 100644
--- a/muse/awl/tcanvas.h
+++ b/muse/awl/tcanvas.h
@@ -42,6 +42,7 @@ enum FollowMode {
static const int rulerHeight = 28;
static const int pianoWidth = 40;
+static const int waveWidth = 40;
static const int drumWidth = 120;
static const int drumHeight = 18;
static const int keyHeight = 13;