From dc656992ec447c981512c9c73737bd2b5144f65f Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Sun, 3 May 2020 10:44:53 +0200 Subject: [PATCH] bug fix: standard style: meter bar gets smaller sometimes if board is full and fader text is short --- ChangeLog | 2 -- src/clientdlgbase.ui | 4 ++-- src/multicolorledbar.cpp | 5 ++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index a25eb934..e7515189 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,8 +18,6 @@ TODO support CoreAudio aggregated devices TODO support internationalization -TODO standard style: meter bar gets smaller sometimes if board is full and fader text is short - TODO implement panning for channels (Ticket #52, #145) TODO sometimes I cannot see the central server in the server list diff --git a/src/clientdlgbase.ui b/src/clientdlgbase.ui index 48b04c53..6f30a5e8 100755 --- a/src/clientdlgbase.ui +++ b/src/clientdlgbase.ui @@ -249,7 +249,7 @@ - 16 + 19 88 @@ -265,7 +265,7 @@ - 16 + 19 88 diff --git a/src/multicolorledbar.cpp b/src/multicolorledbar.cpp index 0cd94af4..b67efea4 100755 --- a/src/multicolorledbar.cpp +++ b/src/multicolorledbar.cpp @@ -48,8 +48,7 @@ CMultiColorLEDBar::CMultiColorLEDBar ( QWidget* parent, Qt::WindowFlags f ) : // create LED object vecpLEDs[iLEDIdx] = new cLED ( parent ); - // add LED to layout with spacer (do not add spacer on the bottom of the - // first LED) + // add LED to layout with spacer (do not add spacer on the bottom of the first LED) if ( iLEDIdx < NUM_STEPS_LED_BAR - 1 ) { pLEDLayout->addStretch(); @@ -77,7 +76,7 @@ CMultiColorLEDBar::CMultiColorLEDBar ( QWidget* parent, Qt::WindowFlags f ) : // according to QScrollArea description: "When using a scroll area to display the // contents of a custom widget, it is important to ensure that the size hint of // the child widget is set to a suitable value." - pProgressBar->setMinimumSize ( QSize ( 1, 1 ) ); + pProgressBar->setMinimumSize ( QSize ( 19, 1 ) ); // 15px + 2 * 1px + 2 * 1px = 19px pLEDMeter->setMinimumSize ( QSize ( 1, 1 ) ); // update the meter type (using the default value of the meter type)