From 4cb5ccab90f3df912f2091c167edf9a79881c4ce Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 29 Oct 2015 13:18:27 +1300 Subject: [PATCH 1/2] Fix audio stats dialog not being sized properly --- interface/src/ui/AudioStatsDialog.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/interface/src/ui/AudioStatsDialog.cpp b/interface/src/ui/AudioStatsDialog.cpp index e57182e251..a475700e02 100644 --- a/interface/src/ui/AudioStatsDialog.cpp +++ b/interface/src/ui/AudioStatsDialog.cpp @@ -65,11 +65,12 @@ AudioStatsDialog::AudioStatsDialog(QWidget* parent) : // Get statistics from the Audio Client _stats = &DependencyManager::get()->getStats(); - // Create layouter + // Create layout _form = new QFormLayout(); + _form->setSizeConstraint(QLayout::SetFixedSize); QDialog::setLayout(_form); - // Load and initilize all channels + // Load and initialize all channels renderStats(); _audioDisplayChannels = QVector>(1); @@ -80,10 +81,8 @@ AudioStatsDialog::AudioStatsDialog(QWidget* parent) : _downstreamID = addChannel(_form, _downstreamStats, COLOR3); _upstreamInjectedID = addChannel(_form, _upstreamInjectedStats, COLOR0); - connect(averageUpdateTimer, SIGNAL(timeout()), this, SLOT(updateTimerTimeout())); averageUpdateTimer->start(1000); - } int AudioStatsDialog::addChannel(QFormLayout* form, QVector& stats, const unsigned color) { @@ -243,7 +242,6 @@ void AudioStatsDialog::paintEvent(QPaintEvent* event) { } QDialog::paintEvent(event); - setFixedSize(width(), height()); } void AudioStatsDialog::reject() { From 568e5536b8e8f3b3554b6476bfd886389778be95 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 29 Oct 2015 13:18:43 +1300 Subject: [PATCH 2/2] Control bandwidth stats dialog sizing similarly --- interface/src/ui/BandwidthDialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/ui/BandwidthDialog.cpp b/interface/src/ui/BandwidthDialog.cpp index e086005783..f07c844894 100644 --- a/interface/src/ui/BandwidthDialog.cpp +++ b/interface/src/ui/BandwidthDialog.cpp @@ -72,8 +72,9 @@ BandwidthDialog::BandwidthDialog(QWidget* parent) : this->setWindowTitle("Bandwidth Details"); - // Create layouter + // Create layout QFormLayout* form = new QFormLayout(); + form->setSizeConstraint(QLayout::SetFixedSize); this->QDialog::setLayout(form); QSharedPointer bandwidthRecorder = DependencyManager::get(); @@ -118,7 +119,6 @@ void BandwidthDialog::paintEvent(QPaintEvent* event) { for (unsigned int i=0; i<_CHANNELCOUNT; i++) _allChannelDisplays[i]->paint(); this->QDialog::paintEvent(event); - this->setFixedSize(this->width(), this->height()); } void BandwidthDialog::reject() {