summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Jonsson <spamatica@gmail.com>2012-07-29 12:27:39 +0000
committerRobert Jonsson <spamatica@gmail.com>2012-07-29 12:27:39 +0000
commitf45bff39714939eb105b2830317ec4de77bf2bb7 (patch)
tree08909341620924065f7f84c5c685800eda6ce1b6
parenta6fc86a01ba952225e03b767cd609fc485964e90 (diff)
fix zoom
-rw-r--r--muse2/ChangeLog2
-rw-r--r--muse2/muse/midiedit/drumedit.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 3f0bebe1..bd511a9f 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,3 +1,5 @@
+29.07.2012:
+ - Tweaked drum editor zooming to give correct initial zoom (rj)
12.07.2012:
- Fixed controllers go wacky after moving effects rack plugins up/down. My bad! (Tim)
Rewrote CtrlList::operator= and several others. Tested OK.
diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp
index 358e9197..ae8ece29 100644
--- a/muse2/muse/midiedit/drumedit.cpp
+++ b/muse2/muse/midiedit/drumedit.cpp
@@ -486,7 +486,7 @@ DrumEdit::DrumEdit(MusECore::PartList* pl, QWidget* parent, const char* name, un
gridS2->setSpacing(0);
time = new MusEGui::MTScale(&_raster, split1w2, xscale);
canvas = new DrumCanvas(this, split1w2, xscale, yscale);
- vscroll = new MusEGui::ScrollScale(-4, 1, yscale, dynamic_cast<DrumCanvas*>(canvas)->getOurDrumMapSize()*TH, Qt::Vertical, split1w2);
+ vscroll = new MusEGui::ScrollScale(-2, 1, yscale, dynamic_cast<DrumCanvas*>(canvas)->getOurDrumMapSize()*TH, Qt::Vertical, split1w2);
int offset = -(MusEGlobal::config.division/4);
canvas->setOrigin(offset, 0);
canvas->setCanvasTools(drumeditTools);