diff options
author | Tim E. Real <termtech@rogers.com> | 2011-03-28 00:20:14 +0000 |
---|---|---|
committer | Tim E. Real <termtech@rogers.com> | 2011-03-28 00:20:14 +0000 |
commit | 9d3d2cbbe21ebed7cb7ddfcd4eb1fb6079582f04 (patch) | |
tree | 782d6768979b9ad9de8e9456b5df2d2c095f5c69 /muse2/muse | |
parent | a26d70917c64a2785fc9ea571d1c102d4bac205c (diff) |
Reclaim some screen real estate. Set zero margin and spacing in ScrollScale constructor.
Diffstat (limited to 'muse2/muse')
-rw-r--r-- | muse2/muse/driver/dummyaudio.cpp | 2 | ||||
-rw-r--r-- | muse2/muse/widgets/scrollscale.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/muse2/muse/driver/dummyaudio.cpp b/muse2/muse/driver/dummyaudio.cpp index 0d495ea9..dfa7a86b 100644 --- a/muse2/muse/driver/dummyaudio.cpp +++ b/muse2/muse/driver/dummyaudio.cpp @@ -368,6 +368,8 @@ static void* dummyLoop(void* ptr) { /*int n = */ poll(&myPollFd, 1 /* npfd */, _pollWait); count += timer.getTimerTicks(); + // FIXME FIXME: There is a crash here (or near-lockup, a race condition?) while zipping + // the cursor around in an editor (pianoroll, master edit) while arranger is open. while (drvPtr->cmdQueue.size()) { Msg &msg = drvPtr->cmdQueue.back(); diff --git a/muse2/muse/widgets/scrollscale.cpp b/muse2/muse/widgets/scrollscale.cpp index de383deb..15ec0947 100644 --- a/muse2/muse/widgets/scrollscale.cpp +++ b/muse2/muse/widgets/scrollscale.cpp @@ -265,6 +265,8 @@ ScrollScale::ScrollScale ( int s1, int s2, int cs, int max_, Qt::Orientation o, scroll->setMinimumHeight ( 50 ); scale->setMaximumHeight ( 70 ); } + box->setContentsMargins(0, 0, 0, 0); + box->setSpacing(0); box->addWidget ( scroll, 10 ); box->addWidget ( scale, 5 ); setLayout(box); |