diff options
author | Florian Jung <flo@windfisch.org> | 2011-12-21 17:54:10 +0000 |
---|---|---|
committer | Florian Jung <flo@windfisch.org> | 2011-12-21 17:54:10 +0000 |
commit | 1fe51e45eebbfc2ac198ed4778c9afdb9eaf2ed0 (patch) | |
tree | 3d976c7966bec1f4d534a6281713ff36ec9cd3e8 /muse2/muse/arranger/alayout.cpp | |
parent | c36a5508aa42e596b005425208054af9a60734b4 (diff) |
merged again
Diffstat (limited to 'muse2/muse/arranger/alayout.cpp')
-rw-r--r-- | muse2/muse/arranger/alayout.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/muse2/muse/arranger/alayout.cpp b/muse2/muse/arranger/alayout.cpp index 119da498..84923f12 100644 --- a/muse2/muse/arranger/alayout.cpp +++ b/muse2/muse/arranger/alayout.cpp @@ -138,7 +138,8 @@ void TLLayout::setGeometry(const QRect &rect) range = 0; // Note this appears to cause a single recursive call to this function - jumps to beginning, // because now the scroll bar wants to be put in the layout. - sb->setVisible(range != 0); + // Moved below. p4.0.44 + ///sb->setVisible(range != 0); if (range) sb->setMaximum(range); @@ -154,6 +155,9 @@ void TLLayout::setGeometry(const QRect &rect) li[4]->setGeometry(QRect(0, y2, w, s4.height())); li[5]->setGeometry(QRect(3, y3, s5.width(), s5.height())); + /// Fix for non-appearing scrollbar. Yes, we must allow the recursive call, but try it here, not above. p4.0.44 Tim + sb->setVisible(range != 0); + //_inSetGeometry = false; } |