Skip to content

O
OpenBoard
Commit 60f485f9 authored by shibakaneki's avatar shibakaneki
Browse files
Options

Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012

parents ff7fe04f f8cbf421
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 10 deletions
src/customWidgets/UBWidgetList.cpp
View file @ 60f485f9
...@@ -81,18 +81,15 @@ int UBWidgetList::scaleWidgets(QSize pSize) ...@@ -81,18 +81,15 @@ int UBWidgetList::scaleWidgets(QSize pSize)
scaleFactor = (float)mWidgetInfo[eachWidget].width() / (float)pSize.width(); scaleFactor = (float)mWidgetInfo[eachWidget].width() / (float)pSize.width();
newWidgetHeight = mWidgetInfo[eachWidget].height()/scaleFactor; newWidgetHeight = mWidgetInfo[eachWidget].height()/scaleFactor;
result += newWidgetHeight; result += newWidgetHeight;
eachWidget->setMinimumHeight(newWidgetHeight- 1);
eachWidget->setMaximumHeight(newWidgetHeight);
} }
else{ else{
if(eWidgetListOrientation_Vertical == mOrientation){ scaleFactor = (float)mWidgetInfo[eachWidget].height() / (float)pSize.height();
result += mWidgetInfo[eachWidget].height(); newWidgetWidth = mWidgetInfo[eachWidget].width()/scaleFactor;
eachWidget->setMinimumHeight(mWidgetInfo[eachWidget].height()); result += newWidgetWidth;
eachWidget->setMaximumHeight(mWidgetInfo[eachWidget].height() + 1); eachWidget->setMinimumWidth(newWidgetWidth - 1);
} eachWidget->setMaximumWidth(newWidgetWidth);
else{
result += mWidgetInfo[eachWidget].width();
eachWidget->setMinimumWidth(mWidgetInfo[eachWidget].width());
eachWidget->setMaximumWidth(mWidgetInfo[eachWidget].width() + 1);
}
} }
//Adding a vertical/horizontal space between each element of the list //Adding a vertical/horizontal space between each element of the list
result += mListElementsSpacing; result += mListElementsSpacing;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment