From f8cbf42134a6ccd58f3d967359f9557cb3b4f9ed Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 12 Jan 2012 16:20:09 +0100 Subject: [PATCH] fixed horizontal widgetlist --- src/customWidgets/UBWidgetList.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/customWidgets/UBWidgetList.cpp b/src/customWidgets/UBWidgetList.cpp index 13dca3a9..0ba01bb0 100644 --- a/src/customWidgets/UBWidgetList.cpp +++ b/src/customWidgets/UBWidgetList.cpp @@ -81,18 +81,15 @@ int UBWidgetList::scaleWidgets(QSize pSize) scaleFactor = (float)mWidgetInfo[eachWidget].width() / (float)pSize.width(); newWidgetHeight = mWidgetInfo[eachWidget].height()/scaleFactor; result += newWidgetHeight; + eachWidget->setMinimumHeight(newWidgetHeight- 1); + eachWidget->setMaximumHeight(newWidgetHeight); } else{ - if(eWidgetListOrientation_Vertical == mOrientation){ - result += mWidgetInfo[eachWidget].height(); - eachWidget->setMinimumHeight(mWidgetInfo[eachWidget].height()); - eachWidget->setMaximumHeight(mWidgetInfo[eachWidget].height() + 1); - } - else{ - result += mWidgetInfo[eachWidget].width(); - eachWidget->setMinimumWidth(mWidgetInfo[eachWidget].width()); - eachWidget->setMaximumWidth(mWidgetInfo[eachWidget].width() + 1); - } + scaleFactor = (float)mWidgetInfo[eachWidget].height() / (float)pSize.height(); + newWidgetWidth = mWidgetInfo[eachWidget].width()/scaleFactor; + result += newWidgetWidth; + eachWidget->setMinimumWidth(newWidgetWidth - 1); + eachWidget->setMaximumWidth(newWidgetWidth); } //Adding a vertical/horizontal space between each element of the list result += mListElementsSpacing;