summaryrefslogtreecommitdiff
path: root/muse2
diff options
context:
space:
mode:
Diffstat (limited to 'muse2')
-rw-r--r--muse2/ChangeLog1
-rw-r--r--muse2/muse/driver/dummyaudio.cpp2
-rw-r--r--muse2/muse/widgets/scrollscale.cpp2
3 files changed, 5 insertions, 0 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index c361e19c..847b0e4c 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -2,6 +2,7 @@
- Fixed end/off-screen selections not being drawn in midi controller graphs. (Tim)
- Reverted Midi Track Info ui layout more or less to pre- Mar 5, with some improvements. (Tim)
- Added: placeholder for Score editor (rj)
+ - Reclaim some screen real estate. Set zero margin and spacing in ScrollScale constructor. (Tim)
24.03.2011:
- Fixed: Problems with midi event list editor. (p4.0.18 Tim)
For ex. problems selecting items while pianroll open. Changed ListEdit::songChanged().
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);