summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim E. Real <termtech@rogers.com>2010-11-16 22:48:49 +0000
committerTim E. Real <termtech@rogers.com>2010-11-16 22:48:49 +0000
commitcccf2ad24c31d5b0ec22865f0a520fcd73e8f8be (patch)
tree2dba32c74fb5100f690f6a85628f8461ce390819
parent40e4ea30dc2078591d687f2c2ae4b6774be704b3 (diff)
Fixed track info sizing problems.
-rw-r--r--muse2/ChangeLog2
-rw-r--r--muse2/muse/arranger/arranger.cpp4
-rw-r--r--muse2/muse/arranger/trackinfo.cpp2
3 files changed, 8 insertions, 0 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index ec50b3d2..be5bf9fa 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,4 +1,6 @@
16.11.2010
+ - Fixed track info sizing problems. In Arranger::switchInfo() added tgrid->update(). (Tim)
+ QLayout::update() seems to be a new method, we needed to call it here.
- Fixed mixer maximum and minimum sizes. (Tim)
Bit of a tough hack. Is there a better way? Done by sub-classing QScrollArea and catching
LayoutRequest events, just before paint events when the window sizes are finally correct.
diff --git a/muse2/muse/arranger/arranger.cpp b/muse2/muse/arranger/arranger.cpp
index ac2f1548..df1d5ded 100644
--- a/muse2/muse/arranger/arranger.cpp
+++ b/muse2/muse/arranger/arranger.cpp
@@ -209,7 +209,11 @@ Arranger::Arranger(QMainWindow* parent, const char* name)
connect(tempo200, SIGNAL(clicked()), SLOT(setTempo200()));
QVBoxLayout* box = new QVBoxLayout(this);
+ box->setContentsMargins(0, 0, 0, 0);
box->addWidget(hLine(this), Qt::AlignTop);
+ //QFrame* hline = hLine(this);
+ //hline->setLineWidth(0);
+ //box->addWidget(hline, Qt::AlignTop);
//---------------------------------------------------
// Tracklist
diff --git a/muse2/muse/arranger/trackinfo.cpp b/muse2/muse/arranger/trackinfo.cpp
index 0eed739e..ff74ff93 100644
--- a/muse2/muse/arranger/trackinfo.cpp
+++ b/muse2/muse/arranger/trackinfo.cpp
@@ -416,12 +416,14 @@ void Arranger::switchInfo(int n)
trackInfo->addWidget(w, 2);
w->show();
tgrid->activate();
+ tgrid->update(); // muse-2 Qt4
}
}
if (trackInfo->curIdx() == n)
return;
trackInfo->raiseWidget(n);
tgrid->activate();
+ tgrid->update(); // muse-2 Qt4
}
//---------------------------------------------------------